2 files changed, 5 insertions, 1 deletions

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 9cceb90e77c5..73c291aeae17 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -700,6 +700,7 @@ xfs_alloc_ioend(
         bio->bi_iter.bi_sector = sector;
         bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
         bio->bi_write_hint = inode->i_write_hint;
+        wbc_init_bio(wbc, bio);
 
         ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
         INIT_LIST_HEAD(&ioend->io_list);
@@ -727,7 +728,7 @@ xfs_chain_bio(
         struct bio *new;
 
         new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
-        bio_copy_dev(new, prev);
+        bio_copy_dev(new, prev);/* also copies over blkcg information */
         new->bi_iter.bi_sector = bio_end_sector(prev);
         new->bi_opf = prev->bi_opf;
         new->bi_write_hint = prev->bi_write_hint;
@@ -782,6 +783,7 @@ xfs_add_to_ioend(
         }
 
         wpc->ioend->io_size += len;
+        wbc_account_io(wbc, page, len);
 }
 
 STATIC void
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 5c28fb22b44b..94fd0a6e3842 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1676,6 +1676,8 @@ xfs_fs_fill_super(
         sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);
         sb->s_max_links = XFS_MAXLINK;
         sb->s_time_gran = 1;
+        sb->s_iflags |= SB_I_CGROUPWB;
+
         set_posix_acl_flag(sb);
 
         /* version 5 superblocks support inode version counters. */