This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / ext3 / ioctl.c

diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index aaf679c..ac15107 100644 (file)
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -60,11 +60,11 @@ 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 | EXT3_IUNLINK_FL))) {
-                       if (!capable(CAP_LINUX_IMMUTABLE))
-                               return -EPERM;
+               if (((oldflags & EXT3_IMMUTABLE_FL) ||
+                       ((flags ^ oldflags) &
+                        (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL)))
+                   && !capable(CAP_LINUX_IMMUTABLE)) {
+                       return -EPERM;          
                }
 
                /*
@@ -156,11 +156,43 @@ flags_err:
                        remove_wait_queue(&EXT3_SB(sb)->ro_wait_queue, &wait);
                        return ret;
                }
+#endif
+#if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_INOXID_NONE)
+       case EXT3_IOC_SETXID: {
+               handle_t *handle;
+               struct ext3_iloc iloc;
+               int xid;
+               int err;
+
+               /* fixme: if stealth, return -ENOTTY */
+               if (!capable(CAP_CONTEXT))
+                       return -EPERM;
+               if (IS_RDONLY(inode))
+                       return -EROFS;
+               if (!(inode->i_sb->s_flags & MS_TAGXID))
+                       return -ENOSYS;
+               if (get_user(xid, (int *) arg))
+                       return -EFAULT;
+
+               handle = ext3_journal_start(inode, 1);
+               if (IS_ERR(handle))
+                       return PTR_ERR(handle);
+               err = ext3_reserve_inode_write(handle, inode, &iloc);
+               if (err)
+                       return err;
+
+               inode->i_xid = (xid & 0xFFFF);
+               inode->i_ctime = CURRENT_TIME;
+
+               err = ext3_mark_iloc_dirty(handle, inode, &iloc);
+               ext3_journal_stop(handle);
+               return err;
+       }
 #endif
        case EXT3_IOC_GETRSVSZ:
                if (test_opt(inode->i_sb, RESERVATION) && S_ISREG(inode->i_mode)) {
                        rsv_window_size = atomic_read(&ei->i_rsv_window.rsv_goal_size);
-                       return put_user(rsv_window_size, (int __user *)arg);
+                       return put_user(rsv_window_size, (int *)arg);
                }
                return -ENOTTY;
        case EXT3_IOC_SETRSVSZ:
@@ -173,7 +205,7 @@ flags_err:
                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
                        return -EACCES;
 
-               if (get_user(rsv_window_size, (int __user *)arg))
+               if (get_user(rsv_window_size, (int *)arg))
                        return -EFAULT;
 
                if (rsv_window_size > EXT3_MAX_RESERVE_BLOCKS)
@@ -191,7 +223,7 @@ flags_err:
                if (IS_RDONLY(inode))
                        return -EROFS;
 
-               if (get_user(n_blocks_count, (__u32 __user *)arg))
+               if (get_user(n_blocks_count, (__u32 *)arg))
                        return -EFAULT;
 
                err = ext3_group_extend(sb, EXT3_SB(sb)->s_es, n_blocks_count);
@@ -212,7 +244,7 @@ flags_err:
                if (IS_RDONLY(inode))
                        return -EROFS;
 
-               if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
+               if (copy_from_user(&input, (struct ext3_new_group_input *)arg,
                                sizeof(input)))
                        return -EFAULT;
 
@@ -224,39 +256,6 @@ flags_err:
                return err;
        }
 
-#if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_INOXID_NONE)
-       case EXT3_IOC_SETXID: {
-               handle_t *handle;
-               struct ext3_iloc iloc;
-               int xid;
-               int err;
-
-               /* fixme: if stealth, return -ENOTTY */
-               if (!capable(CAP_CONTEXT))
-                       return -EPERM;
-               if (IS_RDONLY(inode))
-                       return -EROFS;
-               if (!(inode->i_sb->s_flags & MS_TAGXID))
-                       return -ENOSYS;
-               if (get_user(xid, (int *) arg))
-                       return -EFAULT;
-
-               handle = ext3_journal_start(inode, 1);
-               if (IS_ERR(handle))
-                       return PTR_ERR(handle);
-               err = ext3_reserve_inode_write(handle, inode, &iloc);
-               if (err)
-                       return err;
-
-               inode->i_xid = (xid & 0xFFFF);
-               inode->i_ctime = CURRENT_TIME;
-
-               err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-               ext3_journal_stop(handle);
-               return err;
-       }
-#endif
-
        default:
                return -ENOTTY;
        }