projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge
[cascardo/linux.git]
/
fs
/
reiserfs
/
ioctl.c
diff --git
a/fs/reiserfs/ioctl.c
b/fs/reiserfs/ioctl.c
index
57045f4
..
2f1ddc9
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 */
}
/* 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);
reiserfs_write_lock(inode->i_sb);