From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 15 Apr 2016 18:44:31 +0000 (-0400)
Subject: reiserfs: open-code reiserfs_mutex_lock_safe() in reiserfs_unpack()
X-Git-Tag: v4.7-rc1~144^2~63
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ae1f3f64735905d1751a64ae4b05b9509486612;p=karo-tx-linux.git

reiserfs: open-code reiserfs_mutex_lock_safe() in reiserfs_unpack()

... and have it use inode_lock()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index 57045f423893..2f1ddc908013 100644
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -187,7 +187,11 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)
 	}
 
 	/* we need to make sure nobody is changing the file size beneath us */
-	reiserfs_mutex_lock_safe(&inode->i_mutex, inode->i_sb);
+{
+	int depth = reiserfs_write_unlock_nested(inode->i_sb);
+	inode_lock(inode);
+	reiserfs_write_lock_nested(inode->i_sb, depth);
+}
 
 	reiserfs_write_lock(inode->i_sb);