vserver 2.0 rc7

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

diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 82c325f..dd2fbb4 100644 (file)
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -21,13 +21,14 @@ 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;
@@ -41,7 +42,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))
@@ -58,7 +59,9 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                 *
                 * This test looks nicer. Thanks to Pauline Middelink
                 */
-               if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) {
+               if ((oldflags & EXT3_IMMUTABLE_FL) ||
+                       ((flags ^ oldflags) & (EXT3_APPEND_FL |
+                       EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL))) {
                        if (!capable(CAP_LINUX_IMMUTABLE))
                                return -EPERM;
                }
@@ -87,7 +90,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                ei->i_flags = flags;
 
                ext3_set_inode_flags(inode);
-               inode->i_ctime = CURRENT_TIME;
+               inode->i_ctime = CURRENT_TIME_SEC;
 
                err = ext3_mark_iloc_dirty(handle, inode, &iloc);
 flags_err:
@@ -101,7 +104,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;
@@ -113,7 +116,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);
@@ -121,7 +124,7 @@ flags_err:
                        return PTR_ERR(handle);
                err = ext3_reserve_inode_write(handle, inode, &iloc);
                if (err == 0) {
-                       inode->i_ctime = CURRENT_TIME;
+                       inode->i_ctime = CURRENT_TIME_SEC;
                        inode->i_generation = generation;
                        err = ext3_mark_iloc_dirty(handle, inode, &iloc);
                }
@@ -152,6 +155,90 @@ flags_err:
                        return ret;
                }
 #endif
+       case EXT3_IOC_GETRSVSZ:
+               if (test_opt(inode->i_sb, RESERVATION)
+                       && S_ISREG(inode->i_mode)
+                       && ei->i_block_alloc_info) {
+                       rsv_window_size = ei->i_block_alloc_info->rsv_window_node.rsv_goal_size;
+                       return put_user(rsv_window_size, (int __user *)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 __user *)arg))
+                       return -EFAULT;
+
+               if (rsv_window_size > EXT3_MAX_RESERVE_BLOCKS)
+                       rsv_window_size = EXT3_MAX_RESERVE_BLOCKS;
+
+               /*
+                * need to allocate reservation structure for this inode
+                * before set the window size
+                */
+               down(&ei->truncate_sem);
+               if (!ei->i_block_alloc_info)
+                       ext3_init_block_alloc_info(inode);
+
+               if (ei->i_block_alloc_info){
+                       struct ext3_reserve_window_node *rsv = &ei->i_block_alloc_info->rsv_window_node;
+                       rsv->rsv_goal_size = rsv_window_size;
+               }
+               up(&ei->truncate_sem);
+               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 -EPERM;
+
+               if (IS_RDONLY(inode))
+                       return -EROFS;
+
+               if (get_user(n_blocks_count, (__u32 __user *)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 -EPERM;
+
+               if (IS_RDONLY(inode))
+                       return -EROFS;
+
+               if (copy_from_user(&input, (struct ext3_new_group_input __user *)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: {
                handle_t *handle;
@@ -167,7 +254,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))
@@ -184,6 +271,7 @@ flags_err:
                return err;
        }
 #endif
+
        default:
                return -ENOTTY;
        }