1 files changed, 8 insertions, 7 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 500567dd53b6..c04c7ccba9e3 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -28,6 +28,7 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 
         switch (cmd) {
         case EXT4_IOC_GETFLAGS:
+                ext4_get_inode_flags(ei);
                 flags = ei->i_flags & EXT4_FL_USER_VISIBLE;
                 return put_user(flags, (int __user *) arg);
         case EXT4_IOC_SETFLAGS: {
@@ -40,7 +41,7 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                 if (IS_RDONLY(inode))
                         return -EROFS;
 
-                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+                if (!is_owner_or_cap(inode))
                         return -EACCES;
 
                 if (get_user(flags, (int __user *) arg))
@@ -96,7 +97,7 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
                 ei->i_flags = flags;
 
                 ext4_set_inode_flags(inode);
-                inode->i_ctime = CURRENT_TIME_SEC;
+                inode->i_ctime = ext4_current_time(inode);
 
                 err = ext4_mark_iloc_dirty(handle, inode, &iloc);
 flags_err:
@@ -121,7 +122,7 @@ flags_err:
                 __u32 generation;
                 int err;
 
-                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+                if (!is_owner_or_cap(inode))
                         return -EPERM;
                 if (IS_RDONLY(inode))
                         return -EROFS;
@@ -133,14 +134,14 @@ flags_err:
                         return PTR_ERR(handle);
                 err = ext4_reserve_inode_write(handle, inode, &iloc);
                 if (err == 0) {
-                        inode->i_ctime = CURRENT_TIME_SEC;
+                        inode->i_ctime = ext4_current_time(inode);
                         inode->i_generation = generation;
                         err = ext4_mark_iloc_dirty(handle, inode, &iloc);
                 }
                 ext4_journal_stop(handle);
                 return err;
         }
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
         case EXT4_IOC_WAIT_FOR_READONLY:
                 /*
                  * This is racy - by the time we're woken up and running,
@@ -180,7 +181,7 @@ flags_err:
                 if (IS_RDONLY(inode))
                         return -EROFS;
 
-                if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))
+                if (!is_owner_or_cap(inode))
                         return -EACCES;
 
                 if (get_user(rsv_window_size, (int __user *)arg))
@@ -282,7 +283,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         case EXT4_IOC32_SETVERSION_OLD:
                 cmd = EXT4_IOC_SETVERSION_OLD;
                 break;
-#ifdef CONFIG_JBD_DEBUG
+#ifdef CONFIG_JBD2_DEBUG
         case EXT4_IOC32_WAIT_FOR_READONLY:
                 cmd = EXT4_IOC_WAIT_FOR_READONLY;
                 break;