X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fext3%2Fioctl.c;h=82b4dcb25875b3b065fe05af92db0346d2ff9707;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=7765ab0d5bd4354450cffb8ff0d44a7f3c0f8a93;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c index 7765ab0d5..82b4dcb25 100644 --- 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) || - ((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; } @@ -169,7 +169,7 @@ flags_err: 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))