Patched in Tegra support.

1 files changed, 128 insertions, 459 deletions

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8462eb3c33a..5c38120c389 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -29,7 +29,6 @@
 #include <linux/wait.h>
 #include <linux/blockgroup_lock.h>
 #include <linux/percpu_counter.h>
-#include <crypto/hash.h>
 #ifdef __KERNEL__
 #include <linux/compat.h>
 #endif
@@ -54,17 +53,7 @@
                 printk(KERN_DEBUG f, ## a);                             \
         } while (0)
 #else
-#define ext4_debug(fmt, ...)    no_printk(fmt, ##__VA_ARGS__)
-#endif
-
-/*
- * Turn on EXT_DEBUG to get lots of info about extents operations.
- */
-#define EXT_DEBUG__
-#ifdef EXT_DEBUG
-#define ext_debug(fmt, ...)     printk(fmt, ##__VA_ARGS__)
-#else
-#define ext_debug(fmt, ...)     no_printk(fmt, ##__VA_ARGS__)
+#define ext4_debug(f, a...)     do {} while (0)
 #endif
 
 #define EXT4_ERROR_INODE(inode, fmt, a...) \
@@ -155,17 +144,9 @@ struct ext4_allocation_request {
 #define EXT4_MAP_UNWRITTEN      (1 << BH_Unwritten)
 #define EXT4_MAP_BOUNDARY       (1 << BH_Boundary)
 #define EXT4_MAP_UNINIT         (1 << BH_Uninit)
-/* Sometimes (in the bigalloc case, from ext4_da_get_block_prep) the caller of
- * ext4_map_blocks wants to know whether or not the underlying cluster has
- * already been accounted for. EXT4_MAP_FROM_CLUSTER conveys to the caller that
- * the requested mapping was from previously mapped (or delayed allocated)
- * cluster. We use BH_AllocFromCluster only for this flag. BH_AllocFromCluster
- * should never appear on buffer_head's state flags.
- */
-#define EXT4_MAP_FROM_CLUSTER   (1 << BH_AllocFromCluster)
 #define EXT4_MAP_FLAGS          (EXT4_MAP_NEW | EXT4_MAP_MAPPED |\
                                  EXT4_MAP_UNWRITTEN | EXT4_MAP_BOUNDARY |\
-                                 EXT4_MAP_UNINIT | EXT4_MAP_FROM_CLUSTER)
+                                 EXT4_MAP_UNINIT)
 
 struct ext4_map_blocks {
         ext4_fsblk_t m_pblk;
@@ -195,7 +176,6 @@ struct mpage_da_data {
 #define EXT4_IO_END_UNWRITTEN   0x0001
 #define EXT4_IO_END_ERROR       0x0002
 #define EXT4_IO_END_QUEUED      0x0004
-#define EXT4_IO_END_DIRECT      0x0008
 
 struct ext4_io_page {
         struct page     *p_page;
@@ -204,25 +184,18 @@ struct ext4_io_page {
 
 #define MAX_IO_PAGES 128
 
-/*
- * For converting uninitialized extents on a work queue.
- *
- * 'page' is only used from the writepage() path; 'pages' is only used for
- * buffered writes; they are used to keep page references until conversion
- * takes place.  For AIO/DIO, neither field is filled in.
- */
 typedef struct ext4_io_end {
         struct list_head        list;           /* per-file finished IO list */
         struct inode            *inode;         /* file being written to */
         unsigned int            flag;           /* unwritten or not */
-        struct page             *page;          /* for writepage() path */
+        struct page             *page;          /* page struct for buffer write */
         loff_t                  offset;         /* offset in the file */
         ssize_t                 size;           /* size of the extent */
         struct work_struct      work;           /* data work queue */
         struct kiocb            *iocb;          /* iocb struct for AIO */
         int                     result;         /* error value for AIO */
-        int                     num_io_pages;   /* for writepages() */
-        struct ext4_io_page     *pages[MAX_IO_PAGES]; /* for writepages() */
+        int                     num_io_pages;
+        struct ext4_io_page     *pages[MAX_IO_PAGES];
 } ext4_io_end_t;
 
 struct ext4_io_submit {
@@ -266,11 +239,8 @@ struct ext4_io_submit {
 # define EXT4_BLOCK_SIZE(s)             (EXT4_MIN_BLOCK_SIZE << (s)->s_log_block_size)
 #endif
 #define EXT4_ADDR_PER_BLOCK(s)          (EXT4_BLOCK_SIZE(s) / sizeof(__u32))
-#define EXT4_CLUSTER_SIZE(s)            (EXT4_BLOCK_SIZE(s) << \
-                                         EXT4_SB(s)->s_cluster_bits)
 #ifdef __KERNEL__
 # define EXT4_BLOCK_SIZE_BITS(s)        ((s)->s_blocksize_bits)
-# define EXT4_CLUSTER_BITS(s)           (EXT4_SB(s)->s_cluster_bits)
 #else
 # define EXT4_BLOCK_SIZE_BITS(s)        ((s)->s_log_block_size + 10)
 #endif
@@ -288,14 +258,6 @@ struct ext4_io_submit {
 #endif
 #define EXT4_BLOCK_ALIGN(size, blkbits)         ALIGN((size), (1 << (blkbits)))
 
-/* Translate a block number to a cluster number */
-#define EXT4_B2C(sbi, blk)      ((blk) >> (sbi)->s_cluster_bits)
-/* Translate a cluster number to a block number */
-#define EXT4_C2B(sbi, cluster)  ((cluster) << (sbi)->s_cluster_bits)
-/* Translate # of blks to # of clusters */
-#define EXT4_NUM_B2C(sbi, blks) (((blks) + (sbi)->s_cluster_ratio - 1) >> \
-                                 (sbi)->s_cluster_bits)
-
 /*
  * Structure of a blocks group descriptor
  */
@@ -308,9 +270,7 @@ struct ext4_group_desc
         __le16  bg_free_inodes_count_lo;/* Free inodes count */
         __le16  bg_used_dirs_count_lo;  /* Directories count */
         __le16  bg_flags;               /* EXT4_BG_flags (INODE_UNINIT, etc) */
-        __le32  bg_exclude_bitmap_lo;   /* Exclude bitmap for snapshots */
-        __le16  bg_block_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+bbitmap) LE */
-        __le16  bg_inode_bitmap_csum_lo;/* crc32c(s_uuid+grp_num+ibitmap) LE */
+        __u32   bg_reserved[2];         /* Likely block/inode bitmap checksum */
         __le16  bg_itable_unused_lo;    /* Unused inodes count */
         __le16  bg_checksum;            /* crc16(sb_uuid+group+desc) */
         __le32  bg_block_bitmap_hi;     /* Blocks bitmap block MSB */
@@ -320,26 +280,16 @@ struct ext4_group_desc
         __le16  bg_free_inodes_count_hi;/* Free inodes count MSB */
         __le16  bg_used_dirs_count_hi;  /* Directories count MSB */
         __le16  bg_itable_unused_hi;    /* Unused inodes count MSB */
-        __le32  bg_exclude_bitmap_hi;   /* Exclude bitmap block MSB */
-        __le16  bg_block_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+bbitmap) BE */
-        __le16  bg_inode_bitmap_csum_hi;/* crc32c(s_uuid+grp_num+ibitmap) BE */
-        __u32   bg_reserved;
+        __u32   bg_reserved2[3];
 };
 
-#define EXT4_BG_INODE_BITMAP_CSUM_HI_END        \
-        (offsetof(struct ext4_group_desc, bg_inode_bitmap_csum_hi) + \
-         sizeof(__le16))
-#define EXT4_BG_BLOCK_BITMAP_CSUM_HI_END        \
-        (offsetof(struct ext4_group_desc, bg_block_bitmap_csum_hi) + \
-         sizeof(__le16))
-
 /*
  * Structure of a flex block group info
  */
 
 struct flex_groups {
         atomic_t free_inodes;
-        atomic_t free_clusters;
+        atomic_t free_blocks;
         atomic_t used_dirs;
 };
 
@@ -356,7 +306,6 @@ struct flex_groups {
 #define EXT4_DESC_SIZE(s)               (EXT4_SB(s)->s_desc_size)
 #ifdef __KERNEL__
 # define EXT4_BLOCKS_PER_GROUP(s)       (EXT4_SB(s)->s_blocks_per_group)
-# define EXT4_CLUSTERS_PER_GROUP(s)     (EXT4_SB(s)->s_clusters_per_group)
 # define EXT4_DESC_PER_BLOCK(s)         (EXT4_SB(s)->s_desc_per_block)
 # define EXT4_INODES_PER_GROUP(s)       (EXT4_SB(s)->s_inodes_per_group)
 # define EXT4_DESC_PER_BLOCK_BITS(s)    (EXT4_SB(s)->s_desc_per_block_bits)
@@ -402,7 +351,6 @@ struct flex_groups {
 #define EXT4_EXTENTS_FL                 0x00080000 /* Inode uses extents */
 #define EXT4_EA_INODE_FL                0x00200000 /* Inode used for large EA */
 #define EXT4_EOFBLOCKS_FL               0x00400000 /* Blocks allocated beyond EOF */
-#define EXT4_INLINE_DATA_FL             0x10000000 /* Inode has inline data. */
 #define EXT4_RESERVED_FL                0x80000000 /* reserved for ext4 lib */
 
 #define EXT4_FL_USER_VISIBLE            0x004BDFFF /* User visible flags */
@@ -459,26 +407,28 @@ enum {
         EXT4_INODE_EXTENTS      = 19,   /* Inode uses extents */
         EXT4_INODE_EA_INODE     = 21,   /* Inode used for large EA */
         EXT4_INODE_EOFBLOCKS    = 22,   /* Blocks allocated beyond EOF */
-        EXT4_INODE_INLINE_DATA  = 28,   /* Data in inode. */
         EXT4_INODE_RESERVED     = 31,   /* reserved for ext4 lib */
 };
 
-/*
- * Since it's pretty easy to mix up bit numbers and hex values, we use a
- * build-time check to make sure that EXT4_XXX_FL is consistent with respect to
- * EXT4_INODE_XXX. If all is well, the macros will be dropped, so, it won't cost
- * any extra space in the compiled kernel image, otherwise, the build will fail.
- * It's important that these values are the same, since we are using
- * EXT4_INODE_XXX to test for flag values, but EXT4_XXX_FL must be consistent
- * with the values of FS_XXX_FL defined in include/linux/fs.h and the on-disk
- * values found in ext2, ext3 and ext4 filesystems, and of course the values
- * defined in e2fsprogs.
+#define TEST_FLAG_VALUE(FLAG) (EXT4_##FLAG##_FL == (1 << EXT4_INODE_##FLAG))
+#define CHECK_FLAG_VALUE(FLAG) if (!TEST_FLAG_VALUE(FLAG)) { \
+        printk(KERN_EMERG "EXT4 flag fail: " #FLAG ": %d %d\n", \
+                EXT4_##FLAG##_FL, EXT4_INODE_##FLAG); BUG_ON(1); }
+
+/*
+ * Since it's pretty easy to mix up bit numbers and hex values, and we
+ * can't do a compile-time test for ENUM values, we use a run-time
+ * test to make sure that EXT4_XXX_FL is consistent with respect to
+ * EXT4_INODE_XXX.  If all is well the printk and BUG_ON will all drop
+ * out so it won't cost any extra space in the compiled kernel image.
+ * But it's important that these values are the same, since we are
+ * using EXT4_INODE_XXX to test for the flag values, but EXT4_XX_FL
+ * must be consistent with the values of FS_XXX_FL defined in
+ * include/linux/fs.h and the on-disk values found in ext2, ext3, and
+ * ext4 filesystems, and of course the values defined in e2fsprogs.
  *
  * It's not paranoia if the Murphy's Law really *is* out to get you.  :-)
  */
-#define TEST_FLAG_VALUE(FLAG) (EXT4_##FLAG##_FL == (1 << EXT4_INODE_##FLAG))
-#define CHECK_FLAG_VALUE(FLAG) BUILD_BUG_ON(!TEST_FLAG_VALUE(FLAG))
-
 static inline void ext4_check_flag_values(void)
 {
         CHECK_FLAG_VALUE(SECRM);
@@ -503,7 +453,6 @@ static inline void ext4_check_flag_values(void)
         CHECK_FLAG_VALUE(EXTENTS);
         CHECK_FLAG_VALUE(EA_INODE);
         CHECK_FLAG_VALUE(EOFBLOCKS);
-        CHECK_FLAG_VALUE(INLINE_DATA);
         CHECK_FLAG_VALUE(RESERVED);
 }
 
@@ -542,14 +491,6 @@ struct ext4_new_group_data {
         __u32 free_blocks_count;
 };
 
-/* Indexes used to index group tables in ext4_new_group_data */
-enum {
-        BLOCK_BITMAP = 0,       /* block bitmap */
-        INODE_BITMAP,           /* inode bitmap */
-        INODE_TABLE,            /* inode tables */
-        GROUP_TABLE_COUNT,
-};
-
 /*
  * Flags used by ext4_map_blocks()
  */
@@ -578,10 +519,6 @@ enum {
 #define EXT4_GET_BLOCKS_PUNCH_OUT_EXT           0x0020
         /* Don't normalize allocation size (used for fallocate) */
 #define EXT4_GET_BLOCKS_NO_NORMALIZE            0x0040
-        /* Request will not result in inode size update (user for fallocate) */
-#define EXT4_GET_BLOCKS_KEEP_SIZE               0x0080
-        /* Do not take i_data_sem locking in ext4_map_blocks */
-#define EXT4_GET_BLOCKS_NO_LOCK                 0x0100
 
 /*
  * Flags used by ext4_free_blocks
@@ -590,13 +527,6 @@ enum {
 #define EXT4_FREE_BLOCKS_FORGET         0x0002
 #define EXT4_FREE_BLOCKS_VALIDATED      0x0004
 #define EXT4_FREE_BLOCKS_NO_QUOT_UPDATE 0x0008
-#define EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER   0x0010
-#define EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER    0x0020
-
-/*
- * Flags used by ext4_discard_partial_page_buffers
- */
-#define EXT4_DISCARD_PARTIAL_PG_ZERO_UNMAPPED   0x0001
 
 /*
  * ioctl commands
@@ -607,6 +537,9 @@ enum {
 #define EXT4_IOC_SETVERSION             _IOW('f', 4, long)
 #define EXT4_IOC_GETVERSION_OLD         FS_IOC_GETVERSION
 #define EXT4_IOC_SETVERSION_OLD         FS_IOC_SETVERSION
+#ifdef CONFIG_JBD2_DEBUG
+#define EXT4_IOC_WAIT_FOR_READONLY      _IOR('f', 99, long)
+#endif
 #define EXT4_IOC_GETRSVSZ               _IOR('f', 5, long)
 #define EXT4_IOC_SETRSVSZ               _IOW('f', 6, long)
 #define EXT4_IOC_GROUP_EXTEND           _IOW('f', 7, unsigned long)
@@ -616,7 +549,6 @@ enum {
  /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */
 #define EXT4_IOC_ALLOC_DA_BLKS          _IO('f', 12)
 #define EXT4_IOC_MOVE_EXT               _IOWR('f', 15, struct move_extent)
-#define EXT4_IOC_RESIZE_FS              _IOW('f', 16, __u64)
 
 #if defined(__KERNEL__) && defined(CONFIG_COMPAT)
 /*
@@ -630,6 +562,9 @@ enum {
 #define EXT4_IOC32_SETRSVSZ             _IOW('f', 6, int)
 #define EXT4_IOC32_GROUP_EXTEND         _IOW('f', 7, unsigned int)
 #define EXT4_IOC32_GROUP_ADD            _IOW('f', 8, struct compat_ext4_new_group_input)
+#ifdef CONFIG_JBD2_DEBUG
+#define EXT4_IOC32_WAIT_FOR_READONLY    _IOR('f', 99, int)
+#endif
 #define EXT4_IOC32_GETVERSION_OLD       FS_IOC32_GETVERSION
 #define EXT4_IOC32_SETVERSION_OLD       FS_IOC32_SETVERSION
 #endif
@@ -674,8 +609,7 @@ struct ext4_inode {
                         __le16  l_i_file_acl_high;
                         __le16  l_i_uid_high;   /* these 2 fields */
                         __le16  l_i_gid_high;   /* were reserved2[0] */
-                        __le16  l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */
-                        __le16  l_i_reserved;
+                        __u32   l_i_reserved2;
                 } linux2;
                 struct {
                         __le16  h_i_reserved1;  /* Obsoleted fragment number/size which are removed in ext4 */
@@ -691,7 +625,7 @@ struct ext4_inode {
                 } masix2;
         } osd2;                         /* OS dependent 2 */
         __le16  i_extra_isize;
-        __le16  i_checksum_hi;  /* crc32c(uuid+inum+inode) BE */
+        __le16  i_pad1;
         __le32  i_ctime_extra;  /* extra Change time      (nsec << 2 | epoch) */
         __le32  i_mtime_extra;  /* extra Modification time(nsec << 2 | epoch) */
         __le32  i_atime_extra;  /* extra Access time      (nsec << 2 | epoch) */
@@ -793,7 +727,7 @@ do {									       \
 #define i_gid_low       i_gid
 #define i_uid_high      osd2.linux2.l_i_uid_high
 #define i_gid_high      osd2.linux2.l_i_gid_high
-#define i_checksum_lo   osd2.linux2.l_i_checksum_lo
+#define i_reserved2     osd2.linux2.l_i_reserved2
 
 #elif defined(__GNU__)
 
@@ -821,8 +755,6 @@ struct ext4_ext_cache {
         __u32           ec_len; /* must be 32bit to return holes */
 };
 
-#include "extents_status.h"
-
 /*
  * fourth extended file system inode data in memory
  */
@@ -845,6 +777,7 @@ struct ext4_inode_info {
 #endif
         unsigned long   i_flags;
 
+#ifdef CONFIG_EXT4_FS_XATTR
         /*
          * Extended attributes can be read independently of the main file
          * data. Taking i_mutex even when reading would cause contention
@@ -853,6 +786,7 @@ struct ext4_inode_info {
          * EAs.
          */
         struct rw_semaphore xattr_sem;
+#endif
 
         struct list_head i_orphan;      /* unlinked but open inodes */
 
@@ -898,15 +832,10 @@ struct ext4_inode_info {
         struct list_head i_prealloc_list;
         spinlock_t i_prealloc_lock;
 
-        /* extents status tree */
-        struct ext4_es_tree i_es_tree;
-        rwlock_t i_es_lock;
-
         /* ialloc */
         ext4_group_t    i_last_alloc_group;
 
         /* allocation reservation info for delalloc */
-        /* In case of bigalloc, these refer to clusters rather than blocks */
         unsigned int i_reserved_data_blocks;
         unsigned int i_reserved_meta_blocks;
         unsigned int i_allocated_meta_blocks;
@@ -916,10 +845,6 @@ struct ext4_inode_info {
         /* on-disk additional length */
         __u16 i_extra_isize;
 
-        /* Indicate the inline data space. */
-        u16 i_inline_off;
-        u16 i_inline_size;
-
 #ifdef CONFIG_QUOTA
         /* quota space reservation, managed internally by quota code */
         qsize_t i_reserved_quota;
@@ -929,7 +854,9 @@ struct ext4_inode_info {
         struct list_head i_completed_io_list;
         spinlock_t i_completed_io_lock;
         atomic_t i_ioend_count; /* Number of outstanding io_end structs */
-        atomic_t i_unwritten; /* Nr. of inflight conversions pending */
+        /* current io_end structure for async DIO write*/
+        ext4_io_end_t *cur_aio_dio;
+        atomic_t i_aiodio_unwritten; /* Nr. of inflight conversions pending */
 
         spinlock_t i_block_reservation_lock;
 
@@ -939,9 +866,6 @@ struct ext4_inode_info {
          */
         tid_t i_sync_tid;
         tid_t i_datasync_tid;
-
-        /* Precomputed uuid+inum+igen checksum for seeding inode checksums */
-        __u32 i_csum_seed;
 };
 
 /*
@@ -961,12 +885,12 @@ struct ext4_inode_info {
 /*
  * Mount flags
  */
+#define EXT4_MOUNT_OLDALLOC             0x00002  /* Don't use the new Orlov allocator */
 #define EXT4_MOUNT_GRPID                0x00004 /* Create files with directory's group */
 #define EXT4_MOUNT_DEBUG                0x00008 /* Some debugging messages */
 #define EXT4_MOUNT_ERRORS_CONT          0x00010 /* Continue on errors */
 #define EXT4_MOUNT_ERRORS_RO            0x00020 /* Remount fs ro on errors */
 #define EXT4_MOUNT_ERRORS_PANIC         0x00040 /* Panic on errors */
-#define EXT4_MOUNT_ERRORS_MASK          0x00070
 #define EXT4_MOUNT_MINIX_DF             0x00080 /* Mimics the Minix statfs */
 #define EXT4_MOUNT_NOLOAD               0x00100 /* Don't use existing journal*/
 #define EXT4_MOUNT_DATA_FLAGS           0x00C00 /* Mode for data writes: */
@@ -985,6 +909,7 @@ struct ext4_inode_info {
 #define EXT4_MOUNT_DIOREAD_NOLOCK       0x400000 /* Enable support for dio read nolocking */
 #define EXT4_MOUNT_JOURNAL_CHECKSUM     0x800000 /* Journal checksums */
 #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
+#define EXT4_MOUNT_I_VERSION            0x2000000 /* i_version support */
 #define EXT4_MOUNT_MBLK_IO_SUBMIT       0x4000000 /* multi-block io submits */
 #define EXT4_MOUNT_DELALLOC             0x8000000 /* Delalloc support */
 #define EXT4_MOUNT_DATA_ERR_ABORT       0x10000000 /* Abort on file data write */
@@ -992,9 +917,6 @@ struct ext4_inode_info {
 #define EXT4_MOUNT_DISCARD              0x40000000 /* Issue DISCARD requests */
 #define EXT4_MOUNT_INIT_INODE_TABLE     0x80000000 /* Initialize uninitialized itables */
 
-#define EXT4_MOUNT2_EXPLICIT_DELALLOC   0x00000001 /* User explicitly
-                                                      specified delalloc */
-
 #define clear_opt(sb, opt)              EXT4_SB(sb)->s_mount_opt &= \
                                                 ~EXT4_MOUNT_##opt
 #define set_opt(sb, opt)                EXT4_SB(sb)->s_mount_opt |= \
@@ -1009,13 +931,12 @@ struct ext4_inode_info {
 #define test_opt2(sb, opt)              (EXT4_SB(sb)->s_mount_opt2 & \
                                          EXT4_MOUNT2_##opt)
 
-#define ext4_test_and_set_bit           __test_and_set_bit_le
-#define ext4_set_bit                    __set_bit_le
+#define ext4_set_bit                    __test_and_set_bit_le
 #define ext4_set_bit_atomic             ext2_set_bit_atomic
-#define ext4_test_and_clear_bit         __test_and_clear_bit_le
-#define ext4_clear_bit                  __clear_bit_le
+#define ext4_clear_bit                  __test_and_clear_bit_le
 #define ext4_clear_bit_atomic           ext2_clear_bit_atomic
 #define ext4_test_bit                   test_bit_le
+#define ext4_find_first_zero_bit        find_first_zero_bit_le
 #define ext4_find_next_zero_bit         find_next_zero_bit_le
 #define ext4_find_next_bit              find_next_bit_le
 
@@ -1035,9 +956,6 @@ extern void ext4_set_bits(void *bm, int cur, int len);
 #define EXT4_ERRORS_PANIC               3       /* Panic */
 #define EXT4_ERRORS_DEFAULT             EXT4_ERRORS_CONTINUE
 
-/* Metadata checksum algorithm codes */
-#define EXT4_CRC32C_CHKSUM              1
-
 /*
  * Structure of the super block
  */
@@ -1049,9 +967,9 @@ struct ext4_super_block {
 /*10*/  __le32  s_free_inodes_count;    /* Free inodes count */
         __le32  s_first_data_block;     /* First Data Block */
         __le32  s_log_block_size;       /* Block size */
-        __le32  s_log_cluster_size;     /* Allocation cluster size */
+        __le32  s_obso_log_frag_size;   /* Obsoleted fragment size */
 /*20*/  __le32  s_blocks_per_group;     /* # Blocks per group */
-        __le32  s_clusters_per_group;   /* # Clusters per group */
+        __le32  s_obso_frags_per_group; /* Obsoleted fragments per group */
         __le32  s_inodes_per_group;     /* # Inodes per group */
         __le32  s_mtime;                /* Mount time */
 /*30*/  __le32  s_wtime;                /* Write time */
@@ -1124,7 +1042,7 @@ struct ext4_super_block {
         __le64  s_mmp_block;            /* Block for multi-mount protection */
         __le32  s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
         __u8    s_log_groups_per_flex;  /* FLEX_BG group size */
-        __u8    s_checksum_type;        /* metadata checksum algorithm used */
+        __u8    s_reserved_char_pad;
         __le16  s_reserved_pad;
         __le64  s_kbytes_written;       /* nr of lifetime kilobytes written */
         __le32  s_snapshot_inum;        /* Inode number of active snapshot */
@@ -1147,11 +1065,7 @@ struct ext4_super_block {
         __u8    s_last_error_func[32];  /* function where the error happened */
 #define EXT4_S_ERR_END offsetof(struct ext4_super_block, s_mount_opts)
         __u8    s_mount_opts[64];
-        __le32  s_usr_quota_inum;       /* inode for tracking user quota */
-        __le32  s_grp_quota_inum;       /* inode for tracking group quota */
-        __le32  s_overhead_clusters;    /* overhead blocks/clusters in fs */
-        __le32  s_reserved[108];        /* Padding to the end of the block */
-        __le32  s_checksum;             /* crc32c(superblock) */
+        __le32  s_reserved[112];        /* Padding to the end of the block */
 };
 
 #define EXT4_S_ERR_LEN (EXT4_S_ERR_END - EXT4_S_ERR_START)
@@ -1171,16 +1085,14 @@ struct ext4_sb_info {
         unsigned long s_desc_size;      /* Size of a group descriptor in bytes */
         unsigned long s_inodes_per_block;/* Number of inodes per block */
         unsigned long s_blocks_per_group;/* Number of blocks in a group */
-        unsigned long s_clusters_per_group; /* Number of clusters in a group */
         unsigned long s_inodes_per_group;/* Number of inodes in a group */
         unsigned long s_itb_per_group;  /* Number of inode table blocks per group */
         unsigned long s_gdb_count;      /* Number of group descriptor blocks */
         unsigned long s_desc_per_block; /* Number of group descriptors per block */
         ext4_group_t s_groups_count;    /* Number of groups in the fs */
         ext4_group_t s_blockfile_groups;/* Groups acceptable for non-extent files */
-        unsigned long s_overhead;  /* # of fs overhead clusters */
-        unsigned int s_cluster_ratio;   /* Number of blocks per cluster */
-        unsigned int s_cluster_bits;    /* log2 of s_cluster_ratio */
+        unsigned long s_overhead_last;  /* Last calculated overhead */
+        unsigned long s_blocks_last;    /* Last seen block count */
         loff_t s_bitmap_maxbytes;       /* max bytes for bitmap files */
         struct buffer_head * s_sbh;     /* Buffer containing the super block */
         struct ext4_super_block *s_es;  /* Pointer to the super block in the buffer */
@@ -1188,10 +1100,9 @@ struct ext4_sb_info {
         unsigned int s_mount_opt;
         unsigned int s_mount_opt2;
         unsigned int s_mount_flags;
-        unsigned int s_def_mount_opt;
         ext4_fsblk_t s_sb_block;
-        kuid_t s_resuid;
-        kgid_t s_resgid;
+        uid_t s_resuid;
+        gid_t s_resgid;
         unsigned short s_mount_state;
         unsigned short s_pad;
         int s_addr_per_block_bits;
@@ -1205,15 +1116,14 @@ struct ext4_sb_info {
         u32 s_hash_seed[4];
         int s_def_hash_version;
         int s_hash_unsigned;    /* 3 if hash should be signed, 0 if not */
-        struct percpu_counter s_freeclusters_counter;
+        struct percpu_counter s_freeblocks_counter;
         struct percpu_counter s_freeinodes_counter;
         struct percpu_counter s_dirs_counter;
-        struct percpu_counter s_dirtyclusters_counter;
+        struct percpu_counter s_dirtyblocks_counter;
         struct blockgroup_lock *s_blockgroup_lock;
         struct proc_dir_entry *s_proc;
         struct kobject s_kobj;
         struct completion s_kobj_unregister;
-        struct super_block *s_sb;
 
         /* Journaling */
         struct journal_s *s_journal;
@@ -1225,6 +1135,10 @@ struct ext4_sb_info {
         u32 s_max_batch_time;
         u32 s_min_batch_time;
         struct block_device *journal_bdev;
+#ifdef CONFIG_JBD2_DEBUG
+        struct timer_list turn_ro_timer;        /* For turning read-only (crash simulation) */
+        wait_queue_head_t ro_wait_queue;        /* For people waiting for the fs to go read-only */
+#endif
 #ifdef CONFIG_QUOTA
         char *s_qf_names[MAXQUOTAS];            /* Names of quota files with journalled quota */
         int s_jquota_fmt;                       /* Format of quota to use */
@@ -1241,6 +1155,9 @@ struct ext4_sb_info {
         unsigned long s_ext_blocks;
         unsigned long s_ext_extents;
 #endif
+        /* ext4 extent cache stats */
+        unsigned long extent_cache_hits;
+        unsigned long extent_cache_misses;
 
         /* for buddy allocator */
         struct ext4_group_info ***s_group_info;
@@ -1248,7 +1165,6 @@ struct ext4_sb_info {
         spinlock_t s_md_lock;
         unsigned short *s_mb_offsets;
         unsigned int *s_mb_maxs;
-        unsigned int s_group_info_size;
 
         /* tunables */
         unsigned long s_stripe;
@@ -1259,7 +1175,6 @@ struct ext4_sb_info {
         unsigned int s_mb_order2_reqs;
         unsigned int s_mb_group_prealloc;
         unsigned int s_max_writeback_mb_bump;
-        unsigned int s_max_dir_size_kb;
         /* where last allocation was done - for stream allocation */
         unsigned long s_mb_last_group;
         unsigned long s_mb_last_start;
@@ -1287,12 +1202,8 @@ struct ext4_sb_info {
         unsigned long s_sectors_written_start;
         u64 s_kbytes_written;
 
-        /* the size of zero-out chunk */
-        unsigned int s_extent_max_zeroout_kb;
-
         unsigned int s_log_groups_per_flex;
         struct flex_groups *s_flex_groups;
-        ext4_group_t s_flex_groups_allocated;
 
         /* workqueue for dio unwritten */
         struct workqueue_struct *dio_unwritten_wq;
@@ -1310,12 +1221,6 @@ struct ext4_sb_info {
 
         /* record the last minlen when FITRIM is called. */
         atomic_t s_last_trim_minblks;
-
-        /* Reference to checksum algorithm driver via cryptoapi */
-        struct crypto_shash *s_chksum_driver;
-
-        /* Precomputed FS UUID checksum for seeding other checksums */
-        __u32 s_csum_seed;
 };
 
 static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
@@ -1336,33 +1241,12 @@ static inline struct timespec ext4_current_time(struct inode *inode)
 static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
 {
         return ino == EXT4_ROOT_INO ||
-                ino == EXT4_USR_QUOTA_INO ||
-                ino == EXT4_GRP_QUOTA_INO ||
                 ino == EXT4_JOURNAL_INO ||
                 ino == EXT4_RESIZE_INO ||
                 (ino >= EXT4_FIRST_INO(sb) &&
                  ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));
 }
 
-static inline void ext4_set_io_unwritten_flag(struct inode *inode,
-                                              struct ext4_io_end *io_end)
-{
-        if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
-                io_end->flag |= EXT4_IO_END_UNWRITTEN;
-                atomic_inc(&EXT4_I(inode)->i_unwritten);
-        }
-}
-
-static inline ext4_io_end_t *ext4_inode_aio(struct inode *inode)
-{
-        return inode->i_private;
-}
-
-static inline void ext4_inode_aio_set(struct inode *inode, ext4_io_end_t *io)
-{
-        inode->i_private = io;
-}
-
 /*
  * Inode dynamic state flags
  */
@@ -1376,9 +1260,6 @@ enum {
         EXT4_STATE_DIO_UNWRITTEN,       /* need convert on dio done*/
         EXT4_STATE_NEWENTRY,            /* File just added to dir */
         EXT4_STATE_DELALLOC_RESERVED,   /* blks already reserved for delalloc */
-        EXT4_STATE_DIOREAD_LOCK,        /* Disable support for dio read
-                                           nolocking */
-        EXT4_STATE_MAY_INLINE_DATA,     /* may have in-inode data */
 };
 
 #define EXT4_INODE_BIT_FNS(name, field, offset)                         \
@@ -1478,14 +1359,6 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei)
 #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK        0x0020
 #define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE      0x0040
 #define EXT4_FEATURE_RO_COMPAT_QUOTA            0x0100
-#define EXT4_FEATURE_RO_COMPAT_BIGALLOC         0x0200
-/*
- * METADATA_CSUM also enables group descriptor checksums (GDT_CSUM).  When
- * METADATA_CSUM is set, group descriptor checksums use the same algorithm as
- * all other data structures' checksums.  However, the METADATA_CSUM and
- * GDT_CSUM bits are mutually exclusive.
- */
-#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM    0x0400
 
 #define EXT4_FEATURE_INCOMPAT_COMPRESSION       0x0001
 #define EXT4_FEATURE_INCOMPAT_FILETYPE          0x0002
@@ -1498,9 +1371,6 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei)
 #define EXT4_FEATURE_INCOMPAT_FLEX_BG           0x0200
 #define EXT4_FEATURE_INCOMPAT_EA_INODE          0x0400 /* EA in inode */
 #define EXT4_FEATURE_INCOMPAT_DIRDATA           0x1000 /* data in dirent */
-#define EXT4_FEATURE_INCOMPAT_BG_USE_META_CSUM  0x2000 /* use crc32c for bg */
-#define EXT4_FEATURE_INCOMPAT_LARGEDIR          0x4000 /* >2GB or 3-lvl htree */
-#define EXT4_FEATURE_INCOMPAT_INLINE_DATA       0x8000 /* data in inode */
 
 #define EXT2_FEATURE_COMPAT_SUPP        EXT4_FEATURE_COMPAT_EXT_ATTR
 #define EXT2_FEATURE_INCOMPAT_SUPP      (EXT4_FEATURE_INCOMPAT_FILETYPE| \
@@ -1524,18 +1394,14 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei)
                                          EXT4_FEATURE_INCOMPAT_EXTENTS| \
                                          EXT4_FEATURE_INCOMPAT_64BIT| \
                                          EXT4_FEATURE_INCOMPAT_FLEX_BG| \
-                                         EXT4_FEATURE_INCOMPAT_MMP |    \
-                                         EXT4_FEATURE_INCOMPAT_INLINE_DATA)
+                                         EXT4_FEATURE_INCOMPAT_MMP)
 #define EXT4_FEATURE_RO_COMPAT_SUPP     (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
                                          EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
                                          EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
                                          EXT4_FEATURE_RO_COMPAT_DIR_NLINK | \
                                          EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE | \
                                          EXT4_FEATURE_RO_COMPAT_BTREE_DIR |\
-                                         EXT4_FEATURE_RO_COMPAT_HUGE_FILE |\
-                                         EXT4_FEATURE_RO_COMPAT_BIGALLOC |\
-                                         EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\
-                                         EXT4_FEATURE_RO_COMPAT_QUOTA)
+                                         EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
 
 /*
  * Default values for user and/or group using reserved blocks
@@ -1601,23 +1467,6 @@ struct ext4_dir_entry_2 {
 };
 
 /*
- * This is a bogus directory entry at the end of each leaf block that
- * records checksums.
- */
-struct ext4_dir_entry_tail {
-        __le32  det_reserved_zero1;     /* Pretend to be unused */
-        __le16  det_rec_len;            /* 12 */
-        __u8    det_reserved_zero2;     /* Zero name length */
-        __u8    det_reserved_ft;        /* 0xDE, fake file type */
-        __le32  det_checksum;           /* crc32c(uuid+inum+dirblock) */
-};
-
-#define EXT4_DIRENT_TAIL(block, blocksize) \
-        ((struct ext4_dir_entry_tail *)(((void *)(block)) + \
-                                        ((blocksize) - \
-                                         sizeof(struct ext4_dir_entry_tail))))
-
-/*
  * Ext4 directory file types.  Only the low 3 bits are used.  The
  * other bits are reserved for now.
  */
@@ -1632,8 +1481,6 @@ struct ext4_dir_entry_tail {
 
 #define EXT4_FT_MAX             8
 
-#define EXT4_FT_DIR_CSUM        0xDE
-
 /*
  * EXT4_DIR_PAD defines the directory entries boundaries
  *
@@ -1702,27 +1549,6 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)
 #define DX_HASH_HALF_MD4_UNSIGNED       4
 #define DX_HASH_TEA_UNSIGNED            5
 
-static inline u32 ext4_chksum(struct ext4_sb_info *sbi, u32 crc,
-                              const void *address, unsigned int length)
-{
-        struct {
-                struct shash_desc shash;
-                char ctx[4];
-        } desc;
-        int err;
-
-        BUG_ON(crypto_shash_descsize(sbi->s_chksum_driver)!=sizeof(desc.ctx));
-
-        desc.shash.tfm = sbi->s_chksum_driver;
-        desc.shash.flags = 0;
-        *(u32 *)desc.ctx = crc;
-
-        err = crypto_shash_update(&desc.shash, address, length);
-        BUG_ON(err);
-
-        return *(u32 *)desc.ctx;
-}
-
 #ifdef __KERNEL__
 
 /* hash info structure used by the directory hash */
@@ -1734,11 +1560,7 @@ struct dx_hash_info
         u32             *seed;
 };
 
-
-/* 32 and 64 bit signed EOF for dx directories */
-#define EXT4_HTREE_EOF_32BIT   ((1UL  << (32 - 1)) - 1)
-#define EXT4_HTREE_EOF_64BIT   ((1ULL << (64 - 1)) - 1)
-
+#define EXT4_HTREE_EOF  0x7fffffff
 
 /*
  * Control parameters used by ext4_htree_next_block
@@ -1855,8 +1677,7 @@ struct mmp_struct {
         __le16  mmp_check_interval;
 
         __le16  mmp_pad1;
-        __le32  mmp_pad2[226];
-        __le32  mmp_checksum;           /* crc32c(uuid+mmp_block) */
+        __le32  mmp_pad2[227];
 };
 
 /* arguments passed to the mmp thread */
@@ -1898,25 +1719,9 @@ struct mmpd_data {
 # define NORET_AND      noreturn,
 
 /* bitmap.c */
-extern unsigned int ext4_count_free(char *bitmap, unsigned numchars);
-void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group,
-                                struct ext4_group_desc *gdp,
-                                struct buffer_head *bh, int sz);
-int ext4_inode_bitmap_csum_verify(struct super_block *sb, ext4_group_t group,
-                                  struct ext4_group_desc *gdp,
-                                  struct buffer_head *bh, int sz);
-void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group,
-                                struct ext4_group_desc *gdp,
-                                struct buffer_head *bh);
-int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group,
-                                  struct ext4_group_desc *gdp,
-                                  struct buffer_head *bh);
+extern unsigned int ext4_count_free(struct buffer_head *, unsigned);
 
 /* balloc.c */
-extern void ext4_validate_block_bitmap(struct super_block *sb,
-                                       struct ext4_group_desc *desc,
-                                       unsigned int block_group,
-                                       struct buffer_head *bh);
 extern unsigned int ext4_block_group(struct super_block *sb,
                         ext4_fsblk_t blocknr);
 extern ext4_grpblk_t ext4_block_group_offset(struct super_block *sb,
@@ -1929,87 +1734,48 @@ extern ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode,
                                          unsigned int flags,
                                          unsigned long *count,
                                          int *errp);
-extern int ext4_claim_free_clusters(struct ext4_sb_info *sbi,
-                                    s64 nclusters, unsigned int flags);
-extern ext4_fsblk_t ext4_count_free_clusters(struct super_block *);
+extern int ext4_claim_free_blocks(struct ext4_sb_info *sbi,
+                                  s64 nblocks, unsigned int flags);
+extern ext4_fsblk_t ext4_count_free_blocks(struct super_block *);
 extern void ext4_check_blocks_bitmap(struct super_block *);
 extern struct ext4_group_desc * ext4_get_group_desc(struct super_block * sb,
                                                     ext4_group_t block_group,
                                                     struct buffer_head ** bh);
 extern int ext4_should_retry_alloc(struct super_block *sb, int *retries);
-
-extern struct buffer_head *ext4_read_block_bitmap_nowait(struct super_block *sb,
-                                                ext4_group_t block_group);
-extern int ext4_wait_block_bitmap(struct super_block *sb,
-                                  ext4_group_t block_group,
-                                  struct buffer_head *bh);
-extern struct buffer_head *ext4_read_block_bitmap(struct super_block *sb,
-                                                  ext4_group_t block_group);
-extern void ext4_init_block_bitmap(struct super_block *sb,
-                                   struct buffer_head *bh,
-                                   ext4_group_t group,
-                                   struct ext4_group_desc *desc);
-extern unsigned ext4_free_clusters_after_init(struct super_block *sb,
-                                              ext4_group_t block_group,
-                                              struct ext4_group_desc *gdp);
-extern unsigned ext4_num_overhead_clusters(struct super_block *sb,
-                                           ext4_group_t block_group,
-                                           struct ext4_group_desc *gdp);
+struct buffer_head *ext4_read_block_bitmap(struct super_block *sb,
+                                      ext4_group_t block_group);
+extern unsigned ext4_init_block_bitmap(struct super_block *sb,
+                                       struct buffer_head *bh,
+                                       ext4_group_t group,
+                                       struct ext4_group_desc *desc);
+#define ext4_free_blocks_after_init(sb, group, desc)                    \
+                ext4_init_block_bitmap(sb, NULL, group, desc)
 ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
 
 /* dir.c */
 extern int __ext4_check_dir_entry(const char *, unsigned int, struct inode *,
                                   struct file *,
                                   struct ext4_dir_entry_2 *,
-                                  struct buffer_head *, char *, int,
-                                  unsigned int);
-#define ext4_check_dir_entry(dir, filp, de, bh, buf, size, offset)      \
+                                  struct buffer_head *, unsigned int);
+#define ext4_check_dir_entry(dir, filp, de, bh, offset)                 \
         unlikely(__ext4_check_dir_entry(__func__, __LINE__, (dir), (filp), \
-                                        (de), (bh), (buf), (size), (offset)))
+                                        (de), (bh), (offset)))
 extern int ext4_htree_store_dirent(struct file *dir_file, __u32 hash,
                                     __u32 minor_hash,
                                     struct ext4_dir_entry_2 *dirent);
 extern void ext4_htree_free_dir_info(struct dir_private_info *p);
-extern int ext4_find_dest_de(struct inode *dir, struct inode *inode,
-                             struct buffer_head *bh,
-                             void *buf, int buf_size,
-                             const char *name, int namelen,
-                             struct ext4_dir_entry_2 **dest_de);
-void ext4_insert_dentry(struct inode *inode,
-                        struct ext4_dir_entry_2 *de,
-                        int buf_size,
-                        const char *name, int namelen);
-static inline void ext4_update_dx_flag(struct inode *inode)
-{
-        if (!EXT4_HAS_COMPAT_FEATURE(inode->i_sb,
-                                     EXT4_FEATURE_COMPAT_DIR_INDEX))
-                ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);
-}
-static unsigned char ext4_filetype_table[] = {
-        DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
-};
-
-static inline  unsigned char get_dtype(struct super_block *sb, int filetype)
-{
-        if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FILETYPE) ||
-            (filetype >= EXT4_FT_MAX))
-                return DT_UNKNOWN;
-
-        return ext4_filetype_table[filetype];
-}
 
 /* fsync.c */
 extern int ext4_sync_file(struct file *, loff_t, loff_t, int);
-extern int ext4_flush_unwritten_io(struct inode *);
+extern int ext4_flush_completed_IO(struct inode *);
 
 /* hash.c */
 extern int ext4fs_dirhash(const char *name, int len, struct
                           dx_hash_info *hinfo);
 
 /* ialloc.c */
-extern struct inode *ext4_new_inode(handle_t *, struct inode *, umode_t,
-                                    const struct qstr *qstr, __u32 goal,
-                                    uid_t *owner);
+extern struct inode *ext4_new_inode(handle_t *, struct inode *, int,
+                                    const struct qstr *qstr, __u32 goal);
 extern void ext4_free_inode(handle_t *, struct inode *);
 extern struct inode * ext4_orphan_get(struct super_block *, unsigned long);
 extern unsigned long ext4_count_free_inodes(struct super_block *);
@@ -2018,12 +1784,11 @@ extern void ext4_check_inodes_bitmap(struct super_block *);
 extern void ext4_mark_bitmap_end(int start_bit, int end_bit, char *bitmap);
 extern int ext4_init_inode_table(struct super_block *sb,
                                  ext4_group_t group, int barrier);
-extern void ext4_end_bitmap_read(struct buffer_head *bh, int uptodate);
 
 /* mballoc.c */
 extern long ext4_mb_stats;
 extern long ext4_mb_max_to_scan;
-extern int ext4_mb_init(struct super_block *);
+extern int ext4_mb_init(struct super_block *, int);
 extern int ext4_mb_release(struct super_block *);
 extern ext4_fsblk_t ext4_mb_new_blocks(handle_t *,
                                 struct ext4_allocation_request *, int *);
@@ -2034,8 +1799,6 @@ extern void ext4_exit_mballoc(void);
 extern void ext4_free_blocks(handle_t *handle, struct inode *inode,
                              struct buffer_head *bh, ext4_fsblk_t block,
                              unsigned long count, int flags);
-extern int ext4_mb_alloc_groupinfo(struct super_block *sb,
-                                   ext4_group_t ngroups);
 extern int ext4_mb_add_groupinfo(struct super_block *sb,
                 ext4_group_t i, struct ext4_group_desc *desc);
 extern int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
@@ -2047,23 +1810,8 @@ struct buffer_head *ext4_getblk(handle_t *, struct inode *,
                                                 ext4_lblk_t, int, int *);
 struct buffer_head *ext4_bread(handle_t *, struct inode *,
                                                 ext4_lblk_t, int, int *);
-int ext4_get_block_write(struct inode *inode, sector_t iblock,
-                         struct buffer_head *bh_result, int create);
 int ext4_get_block(struct inode *inode, sector_t iblock,
                                 struct buffer_head *bh_result, int create);
-int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,
-                           struct buffer_head *bh, int create);
-int ext4_walk_page_buffers(handle_t *handle,
-                           struct buffer_head *head,
-                           unsigned from,
-                           unsigned to,
-                           int *partial,
-                           int (*fn)(handle_t *handle,
-                                     struct buffer_head *bh));
-int do_journal_get_write_access(handle_t *handle,
-                                struct buffer_head *bh);
-#define FALL_BACK_TO_NONDELALLOC 1
-#define CONVERT_INLINE_DATA      2
 
 extern struct inode *ext4_iget(struct super_block *, unsigned long);
 extern int  ext4_write_inode(struct inode *, struct writeback_control *);
@@ -2086,9 +1834,10 @@ extern int ext4_alloc_da_blocks(struct inode *inode);
 extern void ext4_set_aops(struct inode *inode);
 extern int ext4_writepage_trans_blocks(struct inode *);
 extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);
-extern int ext4_discard_partial_page_buffers(handle_t *handle,
-                struct address_space *mapping, loff_t from,
-                loff_t length, int flags);
+extern int ext4_block_truncate_page(handle_t *handle,
+                struct address_space *mapping, loff_t from);
+extern int ext4_block_zero_page_range(handle_t *handle,
+                struct address_space *mapping, loff_t from, loff_t length);
 extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);
 extern qsize_t *ext4_get_reserved_space(struct inode *inode);
 extern void ext4_da_update_reserve_space(struct inode *inode,
@@ -2112,26 +1861,10 @@ extern long ext4_compat_ioctl(struct file *, unsigned int, unsigned long);
 extern int ext4_ext_migrate(struct inode *);
 
 /* namei.c */
-extern int ext4_dirent_csum_verify(struct inode *inode,
-                                   struct ext4_dir_entry *dirent);
 extern int ext4_orphan_add(handle_t *, struct inode *);
 extern int ext4_orphan_del(handle_t *, struct inode *);
 extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
                                 __u32 start_minor_hash, __u32 *next_hash);
-extern int search_dir(struct buffer_head *bh,
-                      char *search_buf,
-                      int buf_size,
-                      struct inode *dir,
-                      const struct qstr *d_name,
-                      unsigned int offset,
-                      struct ext4_dir_entry_2 **res_dir);
-extern int ext4_generic_delete_entry(handle_t *handle,
-                                     struct inode *dir,
-                                     struct ext4_dir_entry_2 *de_del,
-                                     struct buffer_head *bh,
-                                     void *entry_buf,
-                                     int buf_size,
-                                     int csum_size);
 
 /* resize.c */
 extern int ext4_group_add(struct super_block *sb,
@@ -2139,52 +1872,45 @@ extern int ext4_group_add(struct super_block *sb,
 extern int ext4_group_extend(struct super_block *sb,
                                 struct ext4_super_block *es,
                                 ext4_fsblk_t n_blocks_count);
-extern int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count);
 
 /* super.c */
-extern int ext4_calculate_overhead(struct super_block *sb);
-extern int ext4_superblock_csum_verify(struct super_block *sb,
-                                       struct ext4_super_block *es);
-extern void ext4_superblock_csum_set(struct super_block *sb);
 extern void *ext4_kvmalloc(size_t size, gfp_t flags);
 extern void *ext4_kvzalloc(size_t size, gfp_t flags);
 extern void ext4_kvfree(void *ptr);
-extern int ext4_alloc_flex_bg_array(struct super_block *sb,
-                                    ext4_group_t ngroup);
-extern __printf(4, 5)
-void __ext4_error(struct super_block *, const char *, unsigned int,
-                  const char *, ...);
+extern void __ext4_error(struct super_block *, const char *, unsigned int,
+                         const char *, ...)
+        __attribute__ ((format (printf, 4, 5)));
 #define ext4_error(sb, message...)      __ext4_error(sb, __func__,      \
                                                      __LINE__, ## message)
-extern __printf(5, 6)
-void ext4_error_inode(struct inode *, const char *, unsigned int, ext4_fsblk_t,
-                      const char *, ...);
-extern __printf(5, 6)
-void ext4_error_file(struct file *, const char *, unsigned int, ext4_fsblk_t,
-                     const char *, ...);
+extern void ext4_error_inode(struct inode *, const char *, unsigned int,
+                             ext4_fsblk_t, const char *, ...)
+        __attribute__ ((format (printf, 5, 6)));
+extern void ext4_error_file(struct file *, const char *, unsigned int,
+                            ext4_fsblk_t, const char *, ...)
+        __attribute__ ((format (printf, 5, 6)));
 extern void __ext4_std_error(struct super_block *, const char *,
                              unsigned int, int);
-extern __printf(4, 5)
-void __ext4_abort(struct super_block *, const char *, unsigned int,
-                  const char *, ...);
+extern void __ext4_abort(struct super_block *, const char *, unsigned int,
+                       const char *, ...)
+        __attribute__ ((format (printf, 4, 5)));
 #define ext4_abort(sb, message...)      __ext4_abort(sb, __func__, \
                                                        __LINE__, ## message)
-extern __printf(4, 5)
-void __ext4_warning(struct super_block *, const char *, unsigned int,
-                    const char *, ...);
+extern void __ext4_warning(struct super_block *, const char *, unsigned int,
+                          const char *, ...)
+        __attribute__ ((format (printf, 4, 5)));
 #define ext4_warning(sb, message...)    __ext4_warning(sb, __func__, \
                                                        __LINE__, ## message)
-extern __printf(3, 4)
-void ext4_msg(struct super_block *, const char *, const char *, ...);
+extern void ext4_msg(struct super_block *, const char *, const char *, ...)
+        __attribute__ ((format (printf, 3, 4)));
 extern void __dump_mmp_msg(struct super_block *, struct mmp_struct *mmp,
                            const char *, unsigned int, const char *);
 #define dump_mmp_msg(sb, mmp, msg)      __dump_mmp_msg(sb, mmp, __func__, \
                                                        __LINE__, msg)
-extern __printf(7, 8)
-void __ext4_grp_locked_error(const char *, unsigned int,
-                             struct super_block *, ext4_group_t,
-                             unsigned long, ext4_fsblk_t,
-                             const char *, ...);
+extern void __ext4_grp_locked_error(const char *, unsigned int, \
+                                    struct super_block *, ext4_group_t, \
+                                    unsigned long, ext4_fsblk_t, \
+                                    const char *, ...)
+        __attribute__ ((format (printf, 7, 8)));
 #define ext4_grp_locked_error(sb, grp, message...) \
         __ext4_grp_locked_error(__func__, __LINE__, (sb), (grp), ## message)
 extern void ext4_update_dynamic_rev(struct super_block *sb);
@@ -2200,8 +1926,8 @@ extern ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,
                                       struct ext4_group_desc *bg);
 extern ext4_fsblk_t ext4_inode_table(struct super_block *sb,
                                      struct ext4_group_desc *bg);
-extern __u32 ext4_free_group_clusters(struct super_block *sb,
-                                      struct ext4_group_desc *bg);
+extern __u32 ext4_free_blks_count(struct super_block *sb,
+                                struct ext4_group_desc *bg);
 extern __u32 ext4_free_inodes_count(struct super_block *sb,
                                  struct ext4_group_desc *bg);
 extern __u32 ext4_used_dirs_count(struct super_block *sb,
@@ -2214,26 +1940,18 @@ extern void ext4_inode_bitmap_set(struct super_block *sb,
                                   struct ext4_group_desc *bg, ext4_fsblk_t blk);
 extern void ext4_inode_table_set(struct super_block *sb,
                                  struct ext4_group_desc *bg, ext4_fsblk_t blk);
-extern void ext4_free_group_clusters_set(struct super_block *sb,
-                                         struct ext4_group_desc *bg,
-                                         __u32 count);
+extern void ext4_free_blks_set(struct super_block *sb,
+                               struct ext4_group_desc *bg, __u32 count);
 extern void ext4_free_inodes_set(struct super_block *sb,
                                 struct ext4_group_desc *bg, __u32 count);
 extern void ext4_used_dirs_set(struct super_block *sb,
                                 struct ext4_group_desc *bg, __u32 count);
 extern void ext4_itable_unused_set(struct super_block *sb,
                                    struct ext4_group_desc *bg, __u32 count);
-extern int ext4_group_desc_csum_verify(struct super_block *sb, __u32 group,
+extern __le16 ext4_group_desc_csum(struct ext4_sb_info *sbi, __u32 group,
+                                   struct ext4_group_desc *gdp);
+extern int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 group,
                                        struct ext4_group_desc *gdp);
-extern void ext4_group_desc_csum_set(struct super_block *sb, __u32 group,
-                                     struct ext4_group_desc *gdp);
-
-static inline int ext4_has_group_desc_csum(struct super_block *sb)
-{
-        return EXT4_HAS_RO_COMPAT_FEATURE(sb,
-                                          EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
-                                          EXT4_FEATURE_RO_COMPAT_METADATA_CSUM);
-}
 
 static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
 {
@@ -2332,13 +2050,13 @@ do {								\
 } while (0)
 
 #ifdef CONFIG_SMP
-/* Each CPU can accumulate percpu_counter_batch clusters in their local
- * counters. So we need to make sure we have free clusters more
+/* Each CPU can accumulate percpu_counter_batch blocks in their local
+ * counters. So we need to make sure we have free blocks more
  * than percpu_counter_batch  * nr_cpu_ids. Also add a window of 4 times.
  */
-#define EXT4_FREECLUSTERS_WATERMARK (4 * (percpu_counter_batch * nr_cpu_ids))
+#define EXT4_FREEBLOCKS_WATERMARK (4 * (percpu_counter_batch * nr_cpu_ids))
 #else
-#define EXT4_FREECLUSTERS_WATERMARK 0
+#define EXT4_FREEBLOCKS_WATERMARK 0
 #endif
 
 static inline void ext4_update_i_disksize(struct inode *inode, loff_t newsize)
@@ -2428,6 +2146,12 @@ static inline void ext4_unlock_group(struct super_block *sb,
         spin_unlock(ext4_group_lock_ptr(sb, group));
 }
 
+static inline void ext4_mark_super_dirty(struct super_block *sb)
+{
+        if (EXT4_SB(sb)->s_journal == NULL)
+                sb->s_dirt =1;
+}
+
 /*
  * Block validity checking
  */
@@ -2452,21 +2176,11 @@ extern const struct file_operations ext4_dir_operations;
 extern const struct inode_operations ext4_file_inode_operations;
 extern const struct file_operations ext4_file_operations;
 extern loff_t ext4_llseek(struct file *file, loff_t offset, int origin);
-extern void ext4_unwritten_wait(struct inode *inode);
 
 /* namei.c */
 extern const struct inode_operations ext4_dir_inode_operations;
 extern const struct inode_operations ext4_special_inode_operations;
 extern struct dentry *ext4_get_parent(struct dentry *child);
-extern struct ext4_dir_entry_2 *ext4_init_dot_dotdot(struct inode *inode,
-                                 struct ext4_dir_entry_2 *de,
-                                 int blocksize, int csum_size,
-                                 unsigned int parent_ino, int dotdot_real_len);
-extern void initialize_dirent_tail(struct ext4_dir_entry_tail *t,
-                                   unsigned int blocksize);
-extern int ext4_handle_dirty_dirent_node(handle_t *handle,
-                                         struct inode *inode,
-                                         struct buffer_head *bh);
 
 /* symlink.c */
 extern const struct inode_operations ext4_symlink_inode_operations;
@@ -2484,9 +2198,6 @@ extern int ext4_check_blockref(const char *, unsigned int,
                                struct inode *, __le32 *, unsigned int);
 
 /* extents.c */
-struct ext4_ext_path;
-struct ext4_extent;
-
 extern int ext4_ext_tree_init(handle_t *handle, struct inode *);
 extern int ext4_ext_writepage_trans_blocks(struct inode *, int);
 extern int ext4_ext_index_trans_blocks(struct inode *inode, int nrblocks,
@@ -2504,27 +2215,8 @@ extern int ext4_convert_unwritten_extents(struct inode *inode, loff_t offset,
                           ssize_t len);
 extern int ext4_map_blocks(handle_t *handle, struct inode *inode,
                            struct ext4_map_blocks *map, int flags);
-extern int ext4_ext_calc_metadata_amount(struct inode *inode,
-                                         ext4_lblk_t lblocks);
-extern int ext4_extent_tree_init(handle_t *, struct inode *);
-extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,
-                                                   int num,
-                                                   struct ext4_ext_path *path);
-extern int ext4_can_extents_be_merged(struct inode *inode,
-                                      struct ext4_extent *ex1,
-                                      struct ext4_extent *ex2);
-extern int ext4_ext_insert_extent(handle_t *, struct inode *,
-                                  struct ext4_ext_path *,
-                                  struct ext4_extent *, int);
-extern struct ext4_ext_path *ext4_ext_find_extent(struct inode *, ext4_lblk_t,
-                                                  struct ext4_ext_path *);
-extern void ext4_ext_drop_refs(struct ext4_ext_path *);
-extern int ext4_ext_check_inode(struct inode *inode);
-extern int ext4_find_delalloc_cluster(struct inode *inode, ext4_lblk_t lblk);
 extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                         __u64 start, __u64 len);
-
-
 /* move_extent.c */
 extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
                              __u64 start_orig, __u64 start_donor,
@@ -2532,11 +2224,11 @@ extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
 
 /* page-io.c */
 extern int __init ext4_init_pageio(void);
-extern void ext4_add_complete_io(ext4_io_end_t *io_end);
 extern void ext4_exit_pageio(void);
 extern void ext4_ioend_wait(struct inode *);
 extern void ext4_free_io_end(ext4_io_end_t *io);
 extern ext4_io_end_t *ext4_init_io_end(struct inode *inode, gfp_t flags);
+extern int ext4_end_io_nolock(ext4_io_end_t *io);
 extern void ext4_io_submit(struct ext4_io_submit *io);
 extern int ext4_bio_write_page(struct ext4_io_submit *io,
                                struct page *page,
@@ -2545,26 +2237,18 @@ extern int ext4_bio_write_page(struct ext4_io_submit *io,
 
 /* mmp.c */
 extern int ext4_multi_mount_protect(struct super_block *, ext4_fsblk_t);
-extern void ext4_mmp_csum_set(struct super_block *sb, struct mmp_struct *mmp);
-extern int ext4_mmp_csum_verify(struct super_block *sb,
-                                struct mmp_struct *mmp);
 
 /* BH_Uninit flag: blocks are allocated but uninitialized on disk */
 enum ext4_state_bits {
         BH_Uninit       /* blocks are allocated but uninitialized on disk */
           = BH_JBDPrivateStart,
-        BH_AllocFromCluster,    /* allocated blocks were part of already
-                                 * allocated cluster. Note that this flag will
-                                 * never, ever appear in a buffer_head's state
-                                 * flag. See EXT4_MAP_FROM_CLUSTER to see where
-                                 * this is used. */
 };
 
 BUFFER_FNS(Uninit, uninit)
 TAS_BUFFER_FNS(Uninit, uninit)
 
 /*
- * Add new method to test whether block and inode bitmaps are properly
+ * Add new method to test wether block and inode bitmaps are properly
  * initialized. With uninit_bg reading the block from disk is not enough
  * to mark the bitmap uptodate. We need to also zero-out the bitmap
  */
@@ -2580,21 +2264,6 @@ static inline void set_bitmap_uptodate(struct buffer_head *bh)
         set_bit(BH_BITMAP_UPTODATE, &(bh)->b_state);
 }
 
-/*
- * Disable DIO read nolock optimization, so new dioreaders will be forced
- * to grab i_mutex
- */
-static inline void ext4_inode_block_unlocked_dio(struct inode *inode)
-{
-        ext4_set_inode_state(inode, EXT4_STATE_DIOREAD_LOCK);
-        smp_mb();
-}
-static inline void ext4_inode_resume_unlocked_dio(struct inode *inode)
-{
-        smp_mb();
-        ext4_clear_inode_state(inode, EXT4_STATE_DIOREAD_LOCK);
-}
-
 #define in_range(b, first, len) ((b) >= (first) && (b) <= (first) + (len) - 1)
 
 /* For ioend & aio unwritten conversion wait queues */