reiserfs: locking, handle nested locks properly

[karo-tx-linux.git] / fs / reiserfs / bitmap.c

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index a98b7740a0fcade0b894920154e65ecbe7987509..881f8ea2a6ac55725b62a2269cfb60e9a85ac46b 100644 (file)
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -1340,10 +1340,11 @@ struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb,
                                 "reading failed", __func__, block);
        else {
                if (buffer_locked(bh)) {
+                       int depth;
                        PROC_INFO_INC(sb, scan_bitmap.wait);
-                       reiserfs_write_unlock(sb);
+                       depth = reiserfs_write_unlock_nested(sb);
                        __wait_on_buffer(bh);
-                       reiserfs_write_lock(sb);
+                       reiserfs_write_lock_nested(sb, depth);
                }
                BUG_ON(!buffer_uptodate(bh));
                BUG_ON(atomic_read(&bh->b_count) == 0);