31 files changed, 673 insertions, 626 deletions

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 819a6d27218a..0c6baaba0651 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -237,20 +237,20 @@ static inline u64 btrfs_ino(struct btrfs_inode *inode)
         return ino;
 }
 
-static inline void btrfs_i_size_write(struct inode *inode, u64 size)
+static inline void btrfs_i_size_write(struct btrfs_inode *inode, u64 size)
 {
-        i_size_write(inode, size);
-        BTRFS_I(inode)->disk_i_size = size;
+        i_size_write(&inode->vfs_inode, size);
+        inode->disk_i_size = size;
 }
 
-static inline bool btrfs_is_free_space_inode(struct inode *inode)
+static inline bool btrfs_is_free_space_inode(struct btrfs_inode *inode)
 {
-        struct btrfs_root *root = BTRFS_I(inode)->root;
+        struct btrfs_root *root = inode->root;
 
         if (root == root->fs_info->tree_root &&
-            btrfs_ino(BTRFS_I(inode)) != BTRFS_BTREE_INODE_OBJECTID)
+            btrfs_ino(inode) != BTRFS_BTREE_INODE_OBJECTID)
                 return true;
-        if (BTRFS_I(inode)->location.objectid == BTRFS_FREE_INO_OBJECTID)
+        if (inode->location.objectid == BTRFS_FREE_INO_OBJECTID)
                 return true;
         return false;
 }
@@ -311,34 +311,33 @@ struct btrfs_dio_private {
  * to grab i_mutex. It is used to avoid the endless truncate due to
  * nonlocked dio read.
  */
-static inline void btrfs_inode_block_unlocked_dio(struct inode *inode)
+static inline void btrfs_inode_block_unlocked_dio(struct btrfs_inode *inode)
 {
-        set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &BTRFS_I(inode)->runtime_flags);
+        set_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
         smp_mb();
 }
 
-static inline void btrfs_inode_resume_unlocked_dio(struct inode *inode)
+static inline void btrfs_inode_resume_unlocked_dio(struct btrfs_inode *inode)
 {
         smp_mb__before_atomic();
-        clear_bit(BTRFS_INODE_READDIO_NEED_LOCK,
-                  &BTRFS_I(inode)->runtime_flags);
+        clear_bit(BTRFS_INODE_READDIO_NEED_LOCK, &inode->runtime_flags);
 }
 
-static inline void btrfs_print_data_csum_error(struct inode *inode,
+static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
                 u64 logical_start, u32 csum, u32 csum_expected, int mirror_num)
 {
-        struct btrfs_root *root = BTRFS_I(inode)->root;
+        struct btrfs_root *root = inode->root;
 
         /* Output minus objectid, which is more meaningful */
         if (root->objectid >= BTRFS_LAST_FREE_OBJECTID)
                 btrfs_warn_rl(root->fs_info,
         "csum failed root %lld ino %lld off %llu csum 0x%08x expected csum 0x%08x mirror %d",
-                        root->objectid, btrfs_ino(BTRFS_I(inode)),
+                        root->objectid, btrfs_ino(inode),
                         logical_start, csum, csum_expected, mirror_num);
         else
                 btrfs_warn_rl(root->fs_info,
         "csum failed root %llu ino %llu off %llu csum 0x%08x expected csum 0x%08x mirror %d",
-                        root->objectid, btrfs_ino(BTRFS_I(inode)),
+                        root->objectid, btrfs_ino(inode),
                         logical_start, csum, csum_expected, mirror_num);
 }
 
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 903c32c9eb22..c7721a6aa3bb 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -100,7 +100,7 @@ static struct bio *compressed_bio_alloc(struct block_device *bdev,
         return btrfs_bio_alloc(bdev, first_byte >> 9, BIO_MAX_PAGES, gfp_flags);
 }
 
-static int check_compressed_csum(struct inode *inode,
+static int check_compressed_csum(struct btrfs_inode *inode,
                                  struct compressed_bio *cb,
                                  u64 disk_start)
 {
@@ -111,7 +111,7 @@ static int check_compressed_csum(struct inode *inode,
         u32 csum;
         u32 *cb_sum = &cb->sums;
 
-        if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)
+        if (inode->flags & BTRFS_INODE_NODATASUM)
                 return 0;
 
         for (i = 0; i < cb->nr_pages; i++) {
@@ -125,7 +125,7 @@ static int check_compressed_csum(struct inode *inode,
 
                 if (csum != *cb_sum) {
                         btrfs_print_data_csum_error(inode, disk_start, csum,
-                                                    *cb_sum, cb->mirror_num);
+                                        *cb_sum, cb->mirror_num);
                         ret = -EIO;
                         goto fail;
                 }
@@ -165,7 +165,7 @@ static void end_compressed_bio_read(struct bio *bio)
                 goto out;
 
         inode = cb->inode;
-        ret = check_compressed_csum(inode, cb,
+        ret = check_compressed_csum(BTRFS_I(inode), cb,
                                     (u64)bio->bi_iter.bi_sector << 9);
         if (ret)
                 goto csum_failed;
@@ -911,32 +911,28 @@ static void free_workspaces(void)
 }
 
 /*
- * given an address space and start/len, compress the bytes.
+ * Given an address space and start and length, compress the bytes into @pages
+ * that are allocated on demand.
  *
- * pages are allocated to hold the compressed result and stored
- * in 'pages'
+ * @out_pages is an in/out parameter, holds maximum number of pages to allocate
+ * and returns number of actually allocated pages
  *
- * out_pages is used to return the number of pages allocated.  There
- * may be pages allocated even if we return an error
- *
- * total_in is used to return the number of bytes actually read.  It
- * may be smaller then len if we had to exit early because we
+ * @total_in is used to return the number of bytes actually read.  It
+ * may be smaller than the input length if we had to exit early because we
  * ran out of room in the pages array or because we cross the
  * max_out threshold.
  *
- * total_out is used to return the total number of compressed bytes
+ * @total_out is an in/out parameter, must be set to the input length and will
+ * be also used to return the total number of compressed bytes
  *