From befa3f4add810b4d7e624fbdbf93a9e3a0348cd2 Mon Sep 17 00:00:00 2001
From: Jeff Mahoney <jeffm@suse.com>
Date: Thu, 2 Aug 2012 21:36:04 -0400
Subject: [PATCH] --- yaml --- r: 322199 b: refs/heads/master c:
 48d1788493f874e5d32dccb2911a7bc91c248b4b h: refs/heads/master i:   322197:
 acd1fc3ecf818fb61cbc7467693d2f31ba29e64e   322195:
 a34b4683b79fceb4ca513278cf601d7dbf39da61   322191:
 4965b78fa19a49c8402097d44919eb82e6d3f22f v: v3

---
 [refs]                     | 2 +-
 trunk/fs/reiserfs/bitmap.c | 2 --
 trunk/fs/reiserfs/inode.c  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 288d0544d823..0d8efd03bcda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea2eea1fa930b9308a06f77fce65c38931eeb13
+refs/heads/master: 48d1788493f874e5d32dccb2911a7bc91c248b4b
diff --git a/trunk/fs/reiserfs/bitmap.c b/trunk/fs/reiserfs/bitmap.c
index 4c0c7d163d15..a98b7740a0fc 100644
--- a/trunk/fs/reiserfs/bitmap.c
+++ b/trunk/fs/reiserfs/bitmap.c
@@ -1334,9 +1334,7 @@ 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);
diff --git a/trunk/fs/reiserfs/inode.c b/trunk/fs/reiserfs/inode.c
index a6d4268fb6c1..855da58db145 100644
--- a/trunk/fs/reiserfs/inode.c
+++ b/trunk/fs/reiserfs/inode.c
@@ -76,10 +76,10 @@ void reiserfs_evict_inode(struct inode *inode)
 		;
 	}
       out:
+	reiserfs_write_unlock_once(inode->i_sb, depth);
 	clear_inode(inode);	/* note this must go after the journal_end to prevent deadlock */
 	dquot_drop(inode);
 	inode->i_blocks = 0;
-	reiserfs_write_unlock_once(inode->i_sb, depth);
 	return;
 
 no_delete: