ext2: convert to fileattr

Use the fileattr API to let the VFS handle locking, permission checking and
conversion.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Cc: Jan Kara <jack@suse.cz>

diff --git a/fs/ext2/ext2.h b/fs/ext2/ext2.h
index 3309fb2..23ffe5b 100644 (file)
--- a/fs/ext2/ext2.h
+++ b/fs/ext2/ext2.h
@@ -283,8 +283,6 @@ static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
 /*
  * ioctl commands
  */
-#define        EXT2_IOC_GETFLAGS               FS_IOC_GETFLAGS
-#define        EXT2_IOC_SETFLAGS               FS_IOC_SETFLAGS
 #define        EXT2_IOC_GETVERSION             FS_IOC_GETVERSION
 #define        EXT2_IOC_SETVERSION             FS_IOC_SETVERSION
 #define        EXT2_IOC_GETRSVSZ               _IOR('f', 5, long)
@@ -293,8 +291,6 @@ static inline __u32 ext2_mask_flags(umode_t mode, __u32 flags)
 /*
  * ioctl commands in 32 bit emulation
  */
-#define EXT2_IOC32_GETFLAGS            FS_IOC32_GETFLAGS
-#define EXT2_IOC32_SETFLAGS            FS_IOC32_SETFLAGS
 #define EXT2_IOC32_GETVERSION          FS_IOC32_GETVERSION
 #define EXT2_IOC32_SETVERSION          FS_IOC32_SETVERSION
 
@@ -772,6 +768,9 @@ extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                       u64 start, u64 len);
 
 /* ioctl.c */
+extern int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa);
+extern int ext2_fileattr_set(struct user_namespace *mnt_userns,
+                            struct dentry *dentry, struct fileattr *fa);
 extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
 extern long ext2_compat_ioctl(struct file *, unsigned int, unsigned long);
 

diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 96044f5..f98466a 100644 (file)
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -204,4 +204,6 @@ const struct inode_operations ext2_file_inode_operations = {
        .get_acl        = ext2_get_acl,
        .set_acl        = ext2_set_acl,
        .fiemap         = ext2_fiemap,
+       .fileattr_get   = ext2_fileattr_get,
+       .fileattr_set   = ext2_fileattr_set,
 };

diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index b399cbb..e8340bf 100644 (file)
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -16,69 +16,51 @@
 #include <linux/mount.h>
 #include <asm/current.h>
 #include <linux/uaccess.h>
+#include <linux/fileattr.h>
 
-
-long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+int ext2_fileattr_get(struct dentry *dentry, struct fileattr *fa)
 {
-       struct inode *inode = file_inode(filp);
-       struct ext2_inode_info *ei = EXT2_I(inode);
-       unsigned int flags;
-       unsigned short rsv_window_size;
-       int ret;
+       struct ext2_inode_info *ei = EXT2_I(d_inode(dentry));
 
-       ext2_debug ("cmd = %u, arg = %lu\n", cmd, arg);
+       fileattr_fill_flags(fa, ei->i_flags & EXT2_FL_USER_VISIBLE);
 
-       switch (cmd) {
-       case EXT2_IOC_GETFLAGS:
-               flags = ei->i_flags & EXT2_FL_USER_VISIBLE;
-               return put_user(flags, (int __user *) arg);
-       case EXT2_IOC_SETFLAGS: {
-               unsigned int oldflags;
+       return 0;
+}
 
-               ret = mnt_want_write_file(filp);
-               if (ret)
-                       return ret;
+int ext2_fileattr_set(struct user_namespace *mnt_userns,
+                     struct dentry *dentry, struct fileattr *fa)
+{
+       struct inode *inode = d_inode(dentry);
+       struct ext2_inode_info *ei = EXT2_I(inode);
 
-               if (!inode_owner_or_capable(&init_user_ns, inode)) {
-                       ret = -EACCES;
-                       goto setflags_out;
-               }
+       if (fileattr_has_fsx(fa))
+               return -EOPNOTSUPP;
 
-               if (get_user(flags, (int __user *) arg)) {
-                       ret = -EFAULT;
-                       goto setflags_out;
-               }
+       /* Is it quota file? Do not allow user to mess with it */
+       if (IS_NOQUOTA(inode))
+               return -EPERM;
 
-               flags = ext2_mask_flags(inode->i_mode, flags);
+       ei->i_flags = (ei->i_flags & ~EXT2_FL_USER_MODIFIABLE) |
+               (fa->flags & EXT2_FL_USER_MODIFIABLE);
 
-               inode_lock(inode);
-               /* Is it quota file? Do not allow user to mess with it */
-               if (IS_NOQUOTA(inode)) {
-                       inode_unlock(inode);
-                       ret = -EPERM;
-                       goto setflags_out;
-               }
-               oldflags = ei->i_flags;
+       ext2_set_inode_flags(inode);
+       inode->i_ctime = current_time(inode);
+       mark_inode_dirty(inode);
 
-               ret = vfs_ioc_setflags_prepare(inode, oldflags, flags);
-               if (ret) {
-                       inode_unlock(inode);
-                       goto setflags_out;
-               }
+       return 0;
+}
 
-               flags = flags & EXT2_FL_USER_MODIFIABLE;
-               flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
-               ei->i_flags = flags;
 
-               ext2_set_inode_flags(inode);
-               inode->i_ctime = current_time(inode);
-               inode_unlock(inode);
+long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+       struct inode *inode = file_inode(filp);
+       struct ext2_inode_info *ei = EXT2_I(inode);
+       unsigned short rsv_window_size;
+       int ret;
 
-               mark_inode_dirty(inode);
-setflags_out:
-               mnt_drop_write_file(filp);
-               return ret;
-       }
+       ext2_debug ("cmd = %u, arg = %lu\n", cmd, arg);
+
+       switch (cmd) {
        case EXT2_IOC_GETVERSION:
                return put_user(inode->i_generation, (int __user *) arg);
        case EXT2_IOC_SETVERSION: {
@@ -163,12 +145,6 @@ long ext2_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        /* These are just misnamed, they actually get/put from/to user an int */
        switch (cmd) {
-       case EXT2_IOC32_GETFLAGS:
-               cmd = EXT2_IOC_GETFLAGS;
-               break;
-       case EXT2_IOC32_SETFLAGS:
-               cmd = EXT2_IOC_SETFLAGS;
-               break;
        case EXT2_IOC32_GETVERSION:
                cmd = EXT2_IOC_GETVERSION;
                break;

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 3367384..c03fc3c 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -427,6 +427,8 @@ const struct inode_operations ext2_dir_inode_operations = {
        .get_acl        = ext2_get_acl,
        .set_acl        = ext2_set_acl,
        .tmpfile        = ext2_tmpfile,
+       .fileattr_get   = ext2_fileattr_get,
+       .fileattr_set   = ext2_fileattr_set,
 };
 
 const struct inode_operations ext2_special_inode_operations = {