Merge to Fedora kernel-2.6.7-1.441

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

diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index f4e2cb1..dbe8a6f 100644 (file)
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -21,14 +21,13 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 {
        struct ext3_inode_info *ei = EXT3_I(inode);
        unsigned int flags;
-       unsigned short rsv_window_size;
 
        ext3_debug ("cmd = %u, arg = %lu\n", cmd, arg);
 
        switch (cmd) {
        case EXT3_IOC_GETFLAGS:
                flags = ei->i_flags & EXT3_FL_USER_VISIBLE;
-               return put_user(flags, (int *) arg);
+               return put_user(flags, (int __user *) arg);
        case EXT3_IOC_SETFLAGS: {
                handle_t *handle = NULL;
                int err;
@@ -42,7 +41,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
                        return -EACCES;
 
-               if (get_user(flags, (int *) arg))
+               if (get_user(flags, (int __user *) arg))
                        return -EFAULT;
 
                if (!S_ISDIR(inode->i_mode))
@@ -104,7 +103,7 @@ flags_err:
        }
        case EXT3_IOC_GETVERSION:
        case EXT3_IOC_GETVERSION_OLD:
-               return put_user(inode->i_generation, (int *) arg);
+               return put_user(inode->i_generation, (int __user *) arg);
        case EXT3_IOC_SETVERSION:
        case EXT3_IOC_SETVERSION_OLD: {
                handle_t *handle;
@@ -116,7 +115,7 @@ flags_err:
                        return -EPERM;
                if (IS_RDONLY(inode))
                        return -EROFS;
-               if (get_user(generation, (int *) arg))
+               if (get_user(generation, (int __user *) arg))
                        return -EFAULT;
 
                handle = ext3_journal_start(inode, 1);
@@ -155,73 +154,6 @@ flags_err:
                        return ret;
                }
 #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 *)arg);
-               }
-               return -ENOTTY;
-       case EXT3_IOC_SETRSVSZ:
-               if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
-                       return -ENOTTY;
-
-               if (IS_RDONLY(inode))
-                       return -EROFS;
-
-               if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
-                       return -EACCES;
-
-               if (get_user(rsv_window_size, (int *)arg))
-                       return -EFAULT;
-
-               if (rsv_window_size > EXT3_MAX_RESERVE_BLOCKS)
-                       rsv_window_size = EXT3_MAX_RESERVE_BLOCKS;
-               atomic_set(&ei->i_rsv_window.rsv_goal_size, rsv_window_size);
-               return 0;
-       case EXT3_IOC_GROUP_EXTEND: {
-               unsigned long n_blocks_count;
-               struct super_block *sb = inode->i_sb;
-               int err;
-
-               if (!capable(CAP_SYS_RESOURCE))
-                       return -EACCES;
-
-               if (sb->s_flags & MS_RDONLY)
-                       return -EROFS;
-
-               if (get_user(n_blocks_count, (__u32 *)arg))
-                       return -EFAULT;
-
-               err = ext3_group_extend(sb, EXT3_SB(sb)->s_es, n_blocks_count);
-               journal_lock_updates(EXT3_SB(sb)->s_journal);
-               journal_flush(EXT3_SB(sb)->s_journal);
-               journal_unlock_updates(EXT3_SB(sb)->s_journal);
-
-               return err;
-       }
-       case EXT3_IOC_GROUP_ADD: {
-               struct ext3_new_group_data input;
-               struct super_block *sb = inode->i_sb;
-               int err;
-
-               if (!capable(CAP_SYS_RESOURCE))
-                       return -EACCES;
-
-               if (inode->i_sb->s_flags & MS_RDONLY)
-                       return -EROFS;
-
-               if (copy_from_user(&input, (struct ext3_new_group_input *)arg,
-                               sizeof(input)))
-                       return -EFAULT;
-
-               err = ext3_group_add(sb, &input);
-               journal_lock_updates(EXT3_SB(sb)->s_journal);
-               journal_flush(EXT3_SB(sb)->s_journal);
-               journal_unlock_updates(EXT3_SB(sb)->s_journal);
-
-               return err;
-       }
-
 
 #if defined(CONFIG_VSERVER_LEGACY) && !defined(CONFIG_INOXID_NONE)
        case EXT3_IOC_SETXID: {