From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 30 Apr 2009 23:44:57 +0000 (+0200)
Subject: kill-the-BKL/reiserfs: release the write lock inside reiserfs_read_bitmap_block()
X-Git-Tag: firefly_0821_release~9833^2~3455^2~42
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c5eface5d0e4eb7f77be346193c2850e7e3b983;p=firefly-linux-kernel-4.4.55.git

kill-the-BKL/reiserfs: release the write lock inside reiserfs_read_bitmap_block()

reiserfs_read_bitmap_block() uses sb_bread() to read the bitmap block. This
helper might sleep.

Then, when the bkl was used, it was released at this point. We can then
relax the write lock too here.

[ Impact: release the reiserfs write lock when it is not needed ]

Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 147033461b87..685495707181 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -1249,7 +1249,9 @@ struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb,
 	else if (bitmap == 0)
 		block = (REISERFS_DISK_OFFSET_IN_BYTES >> sb->s_blocksize_bits) + 1;
 
+	reiserfs_write_unlock(sb);
 	bh = sb_bread(sb, block);
+	reiserfs_write_lock(sb);
 	if (bh == NULL)
 		reiserfs_warning(sb, "sh-2029: %s: bitmap block (#%u) "
 		                 "reading failed", __func__, block);