Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index b8d5fc10d8c0b5376ae345de8bc8fc695d031356..eb7aa3e4ef05caf136f24e0565a28e6d1e0a1539 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1052,7 +1052,7 @@ static void destroy_inodecache(void)
 void ext4_clear_inode(struct inode *inode)
 {
        invalidate_inode_buffers(inode);
-       end_writeback(inode);
+       clear_inode(inode);
        dquot_drop(inode);
        ext4_discard_preallocations(inode);
        if (EXT4_I(inode)->jinode) {
@@ -1493,6 +1493,8 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
 {
        struct ext4_sb_info *sbi = EXT4_SB(sb);
        const struct mount_opts *m;
+       kuid_t uid;
+       kgid_t gid;
        int arg = 0;
 
 #ifdef CONFIG_QUOTA
@@ -1519,10 +1521,20 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
                         "Ignoring removed %s option", opt);
                return 1;
        case Opt_resuid:
-               sbi->s_resuid = arg;
+               uid = make_kuid(current_user_ns(), arg);
+               if (!uid_valid(uid)) {
+                       ext4_msg(sb, KERN_ERR, "Invalid uid value %d", arg);
+                       return -1;
+               }
+               sbi->s_resuid = uid;
                return 1;
        case Opt_resgid:
-               sbi->s_resgid = arg;
+               gid = make_kgid(current_user_ns(), arg);
+               if (!gid_valid(gid)) {
+                       ext4_msg(sb, KERN_ERR, "Invalid gid value %d", arg);
+                       return -1;
+               }
+               sbi->s_resgid = gid;
                return 1;
        case Opt_abort:
                sbi->s_mount_flags |= EXT4_MF_FS_ABORTED;
@@ -1777,12 +1789,14 @@ static int _ext4_show_options(struct seq_file *seq, struct super_block *sb,
                SEQ_OPTS_PRINT("%s", token2str(m->token));
        }
 
-       if (nodefs || sbi->s_resuid != EXT4_DEF_RESUID ||
+       if (nodefs || !uid_eq(sbi->s_resuid, make_kuid(&init_user_ns, EXT4_DEF_RESUID)) ||
            le16_to_cpu(es->s_def_resuid) != EXT4_DEF_RESUID)
-               SEQ_OPTS_PRINT("resuid=%u", sbi->s_resuid);
-       if (nodefs || sbi->s_resgid != EXT4_DEF_RESGID ||
+               SEQ_OPTS_PRINT("resuid=%u",
+                               from_kuid_munged(&init_user_ns, sbi->s_resuid));
+       if (nodefs || !gid_eq(sbi->s_resgid, make_kgid(&init_user_ns, EXT4_DEF_RESGID)) ||
            le16_to_cpu(es->s_def_resgid) != EXT4_DEF_RESGID)
-               SEQ_OPTS_PRINT("resgid=%u", sbi->s_resgid);
+               SEQ_OPTS_PRINT("resgid=%u",
+                               from_kgid_munged(&init_user_ns, sbi->s_resgid));
        def_errors = nodefs ? -1 : le16_to_cpu(es->s_errors);
        if (test_opt(sb, ERRORS_RO) && def_errors != EXT4_ERRORS_RO)
                SEQ_OPTS_PUTS("errors=remount-ro");
@@ -3109,8 +3123,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
        sb->s_fs_info = sbi;
        sbi->s_sb = sb;
        sbi->s_mount_opt = 0;
-       sbi->s_resuid = EXT4_DEF_RESUID;
-       sbi->s_resgid = EXT4_DEF_RESGID;
+       sbi->s_resuid = make_kuid(&init_user_ns, EXT4_DEF_RESUID);
+       sbi->s_resgid = make_kgid(&init_user_ns, EXT4_DEF_RESGID);
        sbi->s_inode_readahead_blks = EXT4_DEF_INODE_READAHEAD_BLKS;
        sbi->s_sb_block = sb_block;
        if (sb->s_bdev->bd_part)
@@ -3230,8 +3244,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
        if (def_mount_opts & EXT4_DEFM_DISCARD)
                set_opt(sb, DISCARD);
 
-       sbi->s_resuid = le16_to_cpu(es->s_def_resuid);
-       sbi->s_resgid = le16_to_cpu(es->s_def_resgid);
+       sbi->s_resuid = make_kuid(&init_user_ns, le16_to_cpu(es->s_def_resuid));
+       sbi->s_resgid = make_kgid(&init_user_ns, le16_to_cpu(es->s_def_resgid));
        sbi->s_commit_interval = JBD2_DEFAULT_MAX_COMMIT_AGE * HZ;
        sbi->s_min_batch_time = EXT4_DEF_MIN_BATCH_TIME;
        sbi->s_max_batch_time = EXT4_DEF_MAX_BATCH_TIME;
@@ -4380,8 +4394,8 @@ static int ext4_unfreeze(struct super_block *sb)
 struct ext4_mount_options {
        unsigned long s_mount_opt;
        unsigned long s_mount_opt2;
-       uid_t s_resuid;
-       gid_t s_resgid;
+       kuid_t s_resuid;
+       kgid_t s_resgid;
        unsigned long s_commit_interval;
        u32 s_min_batch_time, s_max_batch_time;
 #ifdef CONFIG_QUOTA
@@ -4911,7 +4925,6 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
                return -EIO;
        }
 
-       mutex_lock_nested(&inode->i_mutex, I_MUTEX_QUOTA);
        bh = ext4_bread(handle, inode, blk, 1, &err);
        if (!bh)
                goto out;
@@ -4927,16 +4940,13 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
        err = ext4_handle_dirty_metadata(handle, NULL, bh);
        brelse(bh);
 out:
-       if (err) {
-               mutex_unlock(&inode->i_mutex);
+       if (err)
                return err;
-       }
        if (inode->i_size < off + len) {
                i_size_write(inode, off + len);
                EXT4_I(inode)->i_disksize = inode->i_size;
                ext4_mark_inode_dirty(handle, inode);
        }
-       mutex_unlock(&inode->i_mutex);
        return len;
 }