projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.37' into next
[cascardo/linux.git]
/
fs
/
reiserfs
/
ioctl.c
diff --git
a/fs/reiserfs/ioctl.c
b/fs/reiserfs/ioctl.c
index
adf22b4
..
79265fd
100644
(file)
--- a/
fs/reiserfs/ioctl.c
+++ b/
fs/reiserfs/ioctl.c
@@
-9,7
+9,6
@@
#include <linux/time.h>
#include <asm/uaccess.h>
#include <linux/pagemap.h>
#include <linux/time.h>
#include <asm/uaccess.h>
#include <linux/pagemap.h>
-#include <linux/smp_lock.h>
#include <linux/compat.h>
/*
#include <linux/compat.h>
/*
@@
-184,12
+183,11
@@
int reiserfs_unpack(struct inode *inode, struct file *filp)
return 0;
}
return 0;
}
- /* we need to make sure nobody is changing the file size beneath
- ** us
- */
- reiserfs_mutex_lock_safe(&inode->i_mutex, inode->i_sb);
depth = reiserfs_write_lock_once(inode->i_sb);
depth = reiserfs_write_lock_once(inode->i_sb);
+ /* we need to make sure nobody is changing the file size beneath us */
+ reiserfs_mutex_lock_safe(&inode->i_mutex, inode->i_sb);
+
write_from = inode->i_size & (blocksize - 1);
/* if we are on a block boundary, we are already unpacked. */
if (write_from == 0) {
write_from = inode->i_size & (blocksize - 1);
/* if we are on a block boundary, we are already unpacked. */
if (write_from == 0) {