projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
fs
/
reiserfs
/
ioctl.c
diff --git
a/fs/reiserfs/ioctl.c
b/fs/reiserfs/ioctl.c
index
f53505d
..
5cbb81e
100644
(file)
--- a/
fs/reiserfs/ioctl.c
+++ b/
fs/reiserfs/ioctl.c
@@
-170,6
+170,7
@@
int reiserfs_prepare_write(struct file *f, struct page *page,
int reiserfs_unpack(struct inode *inode, struct file *filp)
{
int retval = 0;
int reiserfs_unpack(struct inode *inode, struct file *filp)
{
int retval = 0;
+ int depth;
int index;
struct page *page;
struct address_space *mapping;
int index;
struct page *page;
struct address_space *mapping;
@@
-188,8
+189,8
@@
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
*/
-
mutex_lock(&inode->i_mutex
);
-
reiserfs_write_lock
(inode->i_sb);
+
reiserfs_mutex_lock_safe(&inode->i_mutex, inode->i_sb
);
+
depth = reiserfs_write_lock_once
(inode->i_sb);
write_from = inode->i_size & (blocksize - 1);
/* if we are on a block boundary, we are already unpacked. */
write_from = inode->i_size & (blocksize - 1);
/* if we are on a block boundary, we are already unpacked. */
@@
-224,6
+225,6
@@
int reiserfs_unpack(struct inode *inode, struct file *filp)
out:
mutex_unlock(&inode->i_mutex);
out:
mutex_unlock(&inode->i_mutex);
- reiserfs_write_unlock
(inode->i_sb
);
+ reiserfs_write_unlock
_once(inode->i_sb, depth
);
return retval;
}
return retval;
}