Merge commit 'c0053bd50af5' into omap-for-v4.8/soc

[linux-2.6-block.git] / fs / reiserfs / ioctl.c

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index 57045f423893f5d813dd92c5b3c621a3e0efde08..2f1ddc9080132f9fe9a08c66f1cd999913ee67be 100644 (file)
--- 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);