Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index aaf679c..c5e3ff4 100644 (file)
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -8,7 +8,9 @@
  */
 
 #include <linux/fs.h>
+#include <linux/mount.h>
 #include <linux/jbd.h>
+#include <linux/capability.h>
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>
 #include <linux/time.h>
@@ -49,6 +51,7 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                if (!S_ISDIR(inode->i_mode))
                        flags &= ~EXT3_DIRSYNC_FL;
 
+               mutex_lock(&inode->i_mutex);
                oldflags = ei->i_flags;
 
                /* The JOURNAL_DATA flag is modifiable only by root */
@@ -63,8 +66,10 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                if ((oldflags & EXT3_IMMUTABLE_FL) ||
                        ((flags ^ oldflags) & (EXT3_APPEND_FL |
                        EXT3_IMMUTABLE_FL | EXT3_IUNLINK_FL))) {
-                       if (!capable(CAP_LINUX_IMMUTABLE))
+                       if (!capable(CAP_LINUX_IMMUTABLE)) {
+                               mutex_unlock(&inode->i_mutex);
                                return -EPERM;
+                       }
                }
 
                /*
@@ -72,14 +77,18 @@ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                 * the relevant capability.
                 */
                if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL)) {
-                       if (!capable(CAP_SYS_RESOURCE))
+                       if (!capable(CAP_SYS_RESOURCE)) {
+                               mutex_unlock(&inode->i_mutex);
                                return -EPERM;
+                       }
                }
 
 
                handle = ext3_journal_start(inode, 1);
-               if (IS_ERR(handle))
+               if (IS_ERR(handle)) {
+                       mutex_unlock(&inode->i_mutex);
                        return PTR_ERR(handle);
+               }
                if (IS_SYNC(inode))
                        handle->h_sync = 1;
                err = ext3_reserve_inode_write(handle, inode, &iloc);
@@ -91,16 +100,19 @@ 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:
                ext3_journal_stop(handle);
-               if (err)
+               if (err) {
+                       mutex_unlock(&inode->i_mutex);
                        return err;
+               }
 
                if ((jflag ^ oldflags) & (EXT3_JOURNAL_DATA_FL))
                        err = ext3_change_inode_journal_flag(inode, jflag);
+               mutex_unlock(&inode->i_mutex);
                return err;
        }
        case EXT3_IOC_GETVERSION:
@@ -126,7 +138,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);
                }
@@ -158,16 +170,20 @@ flags_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);
+               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:
+       case EXT3_IOC_SETRSVSZ: {
+
                if (!test_opt(inode->i_sb, RESERVATION) ||!S_ISREG(inode->i_mode))
                        return -ENOTTY;
 
-               if (IS_RDONLY(inode))
+               if (IS_RDONLY(inode) ||
+                       (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
                        return -EROFS;
 
                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
@@ -178,8 +194,22 @@ flags_err:
 
                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);
+
+               /*
+                * need to allocate reservation structure for this inode
+                * before set the window size
+                */
+               mutex_lock(&ei->truncate_mutex);
+               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;
+               }
+               mutex_unlock(&ei->truncate_mutex);
                return 0;
+       }
        case EXT3_IOC_GROUP_EXTEND: {
                unsigned long n_blocks_count;
                struct super_block *sb = inode->i_sb;
@@ -188,7 +218,8 @@ flags_err:
                if (!capable(CAP_SYS_RESOURCE))
                        return -EPERM;
 
-               if (IS_RDONLY(inode))
+               if (IS_RDONLY(inode) ||
+                       (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
                        return -EROFS;
 
                if (get_user(n_blocks_count, (__u32 __user *)arg))
@@ -209,7 +240,8 @@ flags_err:
                if (!capable(CAP_SYS_RESOURCE))
                        return -EPERM;
 
-               if (IS_RDONLY(inode))
+               if (IS_RDONLY(inode) ||
+                       (filp && MNT_IS_RDONLY(filp->f_vfsmnt)))
                        return -EROFS;
 
                if (copy_from_user(&input, (struct ext3_new_group_input __user *)arg,
@@ -238,7 +270,7 @@ flags_err:
                        return -EROFS;
                if (!(inode->i_sb->s_flags & MS_TAGXID))
                        return -ENOSYS;
-               if (get_user(xid, (int *) arg))
+               if (get_user(xid, (int __user *) arg))
                        return -EFAULT;
 
                handle = ext3_journal_start(inode, 1);