1 files changed, 31 insertions, 26 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 80928f716850..3cdb0a2fc648 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -45,7 +45,7 @@
 #include <linux/freezer.h>
 
 #include "ext4.h"
-#include "ext4_extents.h"
+#include "ext4_extents.h"       /* Needed for trace points definition */
 #include "ext4_jbd2.h"
 #include "xattr.h"
 #include "acl.h"
@@ -939,10 +939,11 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
                 return NULL;
 
         ei->vfs_inode.i_version = 1;
-        ei->vfs_inode.i_data.writeback_index = 0;
         memset(&ei->i_cached_extent, 0, sizeof(struct ext4_ext_cache));
         INIT_LIST_HEAD(&ei->i_prealloc_list);
         spin_lock_init(&ei->i_prealloc_lock);
+        ext4_es_init_tree(&ei->i_es_tree);
+        rwlock_init(&ei->i_es_lock);
         ei->i_reserved_data_blocks = 0;
         ei->i_reserved_meta_blocks = 0;
         ei->i_allocated_meta_blocks = 0;
@@ -996,9 +997,7 @@ static void init_once(void *foo)
         struct ext4_inode_info *ei = (struct ext4_inode_info *) foo;
 
         INIT_LIST_HEAD(&ei->i_orphan);
-#ifdef CONFIG_EXT4_FS_XATTR
         init_rwsem(&ei->xattr_sem);
-#endif
         init_rwsem(&ei->i_data_sem);
         inode_init_once(&ei->vfs_inode);
 }
@@ -1031,6 +1030,7 @@ void ext4_clear_inode(struct inode *inode)
         clear_inode(inode);
         dquot_drop(inode);
         ext4_discard_preallocations(inode);
+        ext4_es_remove_extent(inode, 0, EXT_MAX_BLOCKS);
         if (EXT4_I(inode)->jinode) {
                 jbd2_journal_release_jbd_inode(EXT4_JOURNAL(inode),
                                                EXT4_I(inode)->jinode);
@@ -1447,13 +1447,8 @@ static const struct mount_opts {
         {Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_DATAJ},
         {Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_DATAJ},
         {Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA, MOPT_DATAJ},
-#ifdef CONFIG_EXT4_FS_XATTR
         {Opt_user_xattr, EXT4_MOUNT_XATTR_USER, MOPT_SET},
         {Opt_nouser_xattr, EXT4_MOUNT_XATTR_USER, MOPT_CLEAR},
-#else
-        {Opt_user_xattr, 0, MOPT_NOSUPPORT},
-        {Opt_nouser_xattr, 0, MOPT_NOSUPPORT},
-#endif
 #ifdef CONFIG_EXT4_FS_POSIX_ACL
         {Opt_acl, EXT4_MOUNT_POSIX_ACL, MOPT_SET},
         {Opt_noacl, EXT4_MOUNT_POSIX_ACL, MOPT_CLEAR},
@@ -3202,7 +3197,6 @@ int ext4_calculate_overhead(struct super_block *sb)
         ext4_fsblk_t overhead = 0;
         char *buf = (char *) get_zeroed_page(GFP_KERNEL);
 
-        memset(buf, 0, PAGE_SIZE);
         if (!buf)
                 return -ENOMEM;
 
@@ -3256,7 +3250,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         unsigned int i;
         int needs_recovery, has_huge_files, has_bigalloc;
         __u64 blocks_count;
-        int err;
+        int err = 0;
         unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
         ext4_group_t first_not_zeroed;
 
@@ -3272,9 +3266,6 @@ 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 = 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)
@@ -3285,6 +3276,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         for (cp = sb->s_id; (cp = strchr(cp, '/'));)
                 *cp = '!';
 
+        /* -EINVAL is default */
         ret = -EINVAL;
         blocksize = sb_min_blocksize(sb, EXT4_MIN_BLOCK_SIZE);
         if (!blocksize) {
@@ -3369,9 +3361,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         if (def_mount_opts & EXT4_DEFM_UID16)
                 set_opt(sb, NO_UID32);
         /* xattr user namespace & acls are now defaulted on */
-#ifdef CONFIG_EXT4_FS_XATTR
         set_opt(sb, XATTR_USER);
-#endif
 #ifdef CONFIG_EXT4_FS_POSIX_ACL
         set_opt(sb, POSIX_ACL);
 #endif
@@ -3662,7 +3652,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                          " too large to mount safely on this system");
                 if (sizeof(sector_t) < 8)
                         ext4_msg(sb, KERN_WARNING, "CONFIG_LBDAF not enabled");
-                ret = err;
                 goto failed_mount;
         }
 
@@ -3770,7 +3759,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
         }
         if (err) {
                 ext4_msg(sb, KERN_ERR, "insufficient memory");
-                ret = err;
                 goto failed_mount3;
         }
 
@@ -3801,7 +3789,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 
         INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
         mutex_init(&sbi->s_orphan_lock);
-        sbi->s_resize_flags = 0;
 
         sb->s_root = NULL;
 
@@ -3897,8 +3884,8 @@ no_journal:
         if (es->s_overhead_clusters)
                 sbi->s_overhead = le32_to_cpu(es->s_overhead_clusters);
         else {
-                ret = ext4_calculate_overhead(sb);
-                if (ret)
+                err = ext4_calculate_overhead(sb);
+                if (err)
                         goto failed_mount_wq;
         }
 
@@ -3910,6 +3897,7 @@ no_journal:
                 alloc_workqueue("ext4-dio-unwritten", WQ_MEM_RECLAIM | WQ_UNBOUND, 1);
         if (!EXT4_SB(sb)->dio_unwritten_wq) {
                 printk(KERN_ERR "EXT4-fs: failed to create DIO workqueue\n");
+                ret = -ENOMEM;
                 goto failed_mount_wq;
         }
 
@@ -4012,12 +4000,20 @@ no_journal:
         /* Enable quota usage during mount. */
         if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_QUOTA) &&
             !(sb->s_flags & MS_RDONLY)) {
-                ret = ext4_enable_quotas(sb);
-                if (ret)
+                err = ext4_enable_quotas(sb);
+                if (err)
                         goto failed_mount7;
         }
 #endif  /* CONFIG_QUOTA */
 
+        if (test_opt(sb, DISCARD)) {
+                struct request_queue *q = bdev_get_queue(sb->s_bdev);
+                if (!blk_queue_discard(q))
+                        ext4_msg(sb, KERN_WARNING,
+                                 "mounting with \"discard\" option, but "
+                                 "the device does not support discard");
+        }
+
         ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "
                  "Opts: %s%s%s", descr, sbi->s_es->s_mount_opts,
                  *sbi->s_es->s_mount_opts ? "; " : "", orig_data);
@@ -4084,7 +4080,7 @@ out_fail:
         kfree(sbi);
 out_free_orig:
         kfree(orig_data);
-        return ret;
+        return err ? err : ret;
 }
 
 /*
@@ -4790,7 +4786,7 @@ static int ext4_statfs(struct dentry *dentry, struct kstatfs *buf)
 
         buf->f_type = EXT4_SUPER_MAGIC;
         buf->f_bsize = sb->s_blocksize;
-        buf->f_blocks = ext4_blocks_count(es) - EXT4_C2B(sbi, sbi->s_overhead);
+        buf->f_blocks = ext4_blocks_count(es) - EXT4_C2B(sbi, overhead);
         bfree = percpu_counter_sum_positive(&sbi->s_freeclusters_counter) -
                 percpu_counter_sum_positive(&sbi->s_dirtyclusters_counter);
         /* prevent underflow in case that few free space is available */
@@ -5282,6 +5278,7 @@ static int __init ext4_init_fs(void)
         ext4_li_info = NULL;
         mutex_init(&ext4_li_mtx);
 
+        /* Build-time check for flags consistency */
         ext4_check_flag_values();
 
         for (i = 0; i < EXT4_WQ_HASH_SZ; i++) {
@@ -5289,9 +5286,14 @@ static int __init ext4_init_fs(void)
                 init_waitqueue_head(&ext4__ioend_wq[i]);
         }
 
-        err = ext4_init_pageio();
+        err = ext4_init_es();
         if (err)
                 return err;
+
+        err = ext4_init_pageio();
+        if (err)
+                goto out7;
+
         err = ext4_init_system_zone();
         if (err)
                 goto out6;
@@ -5341,6 +5343,9 @@ out5:
         ext4_exit_system_zone();
 out6:
         ext4_exit_pageio();
+out7:
+        ext4_exit_es();
+
         return err;
 }