git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
fs
/
ext3
/
ioctl.c
diff --git
a/fs/ext3/ioctl.c
b/fs/ext3/ioctl.c
index
7765ab0
..
82b4dcb
100644
(file)
--- a/
fs/ext3/ioctl.c
+++ b/
fs/ext3/ioctl.c
@@
-59,8
+59,8
@@
int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
* This test looks nicer. Thanks to Pauline Middelink
*/
if ((oldflags & EXT3_IMMUTABLE_FL) ||
* This test looks nicer. Thanks to Pauline Middelink
*/
if ((oldflags & EXT3_IMMUTABLE_FL) ||
- ((flags ^ oldflags) &
-
(EXT3_APPEND_FL | EXT3_IMMUTABLE
_FL))) {
+ ((flags ^ oldflags) &
(EXT3_APPEND_FL |
+
EXT3_IMMUTABLE_FL | EXT3_IUNLINK
_FL))) {
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
if (!capable(CAP_LINUX_IMMUTABLE))
return -EPERM;
}
@@
-169,7
+169,7
@@
flags_err:
if (!(inode->i_sb->s_flags & MS_TAGXID))
return -ENOSYS;
if (get_user(xid, (int *) arg))
if (!(inode->i_sb->s_flags & MS_TAGXID))
return -ENOSYS;
if (get_user(xid, (int *) arg))
- return -EFAULT;
+ return -EFAULT;
handle = ext3_journal_start(inode, 1);
if (IS_ERR(handle))
handle = ext3_journal_start(inode, 1);
if (IS_ERR(handle))