Skip to content

Commit e7ccfc4

Browse files
minchanktorvalds
authored andcommitted
zram: revalidate disk under init_lock
Commit b4c5c60 ("zram: avoid lockdep splat by revalidate_disk") moved revalidate_disk call out of init_lock to avoid lockdep false-positive splat. However, commit 08eee69 ("zram: remove init_lock in zram_make_request") removed init_lock in IO path so there is no worry about lockdep splat. So, let's restore it. This patch is needed to set BDI_CAP_STABLE_WRITES atomically in next patch. Fixes: da9556a ("zram: user per-cpu compression streams") Link: http://lkml.kernel.org/r/1482366980-3782-3-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Takashi Iwai <tiwai@suse.de> Cc: Hyeoncheol Lee <cheol.lee@lge.com> Cc: <yjay.kim@lge.com> Cc: Sangseok Lee <sangseok.lee@lge.com> Cc: Hugh Dickins <hughd@google.com> Cc: Darrick J. Wong <darrick.wong@oracle.com> Cc: <stable@vger.kernel.org> [4.7+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent f057142 commit e7ccfc4

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/block/zram/zram_drv.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,14 +1095,8 @@ static ssize_t disksize_store(struct device *dev,
10951095
zram->comp = comp;
10961096
zram->disksize = disksize;
10971097
set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);
1098-
up_write(&zram->init_lock);
1099-
1100-
/*
1101-
* Revalidate disk out of the init_lock to avoid lockdep splat.
1102-
* It's okay because disk's capacity is protected by init_lock
1103-
* so that revalidate_disk always sees up-to-date capacity.
1104-
*/
11051098
revalidate_disk(zram->disk);
1099+
up_write(&zram->init_lock);
11061100

11071101
return len;
11081102

0 commit comments

Comments
 (0)