btrfs: sink gfp_t parameter to btrfs_qgroup_trace_extent

All callers pass GFP_NOFS, we can drop the parameter and use it
directly.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 39f67ca..4786b59 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1842,7 +1842,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
 }
 
 int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
-                             u64 num_bytes, gfp_t gfp_flag)
+                             u64 num_bytes)
 {
        struct btrfs_fs_info *fs_info = trans->fs_info;
        struct btrfs_qgroup_extent_record *record;
@@ -1852,7 +1852,7 @@ int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
        if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)
            || bytenr == 0 || num_bytes == 0)
                return 0;
-       record = kzalloc(sizeof(*record), gfp_flag);
+       record = kzalloc(sizeof(*record), GFP_NOFS);
        if (!record)
                return -ENOMEM;
 
@@ -1904,8 +1904,7 @@ int btrfs_qgroup_trace_leaf_items(struct btrfs_trans_handle *trans,
 
                num_bytes = btrfs_file_extent_disk_num_bytes(eb, fi);
 
-               ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes,
-                                               GFP_NOFS);
+               ret = btrfs_qgroup_trace_extent(trans, bytenr, num_bytes);
                if (ret)
                        return ret;
        }
@@ -2104,12 +2103,11 @@ static int qgroup_trace_extent_swap(struct btrfs_trans_handle* trans,
         * blocks for qgroup accounting.
         */
        ret = btrfs_qgroup_trace_extent(trans, src_path->nodes[dst_level]->start,
-                       nodesize, GFP_NOFS);
+                                       nodesize);
        if (ret < 0)
                goto out;
-       ret = btrfs_qgroup_trace_extent(trans,
-                       dst_path->nodes[dst_level]->start,
-                       nodesize, GFP_NOFS);
+       ret = btrfs_qgroup_trace_extent(trans, dst_path->nodes[dst_level]->start,
+                                       nodesize);
        if (ret < 0)
                goto out;
 
@@ -2393,8 +2391,7 @@ walk_down:
                        path->locks[level] = BTRFS_READ_LOCK;
 
                        ret = btrfs_qgroup_trace_extent(trans, child_bytenr,
-                                                       fs_info->nodesize,
-                                                       GFP_NOFS);
+                                                       fs_info->nodesize);
                        if (ret)
                                goto out;
                }

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index 3fb5459..7bffa10 100644 (file)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -321,7 +321,7 @@ int btrfs_qgroup_trace_extent_post(struct btrfs_trans_handle *trans,
  * (NULL trans)
  */
 int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans, u64 bytenr,
-                             u64 num_bytes, gfp_t gfp_flag);
+                             u64 num_bytes);
 
 /*
  * Inform qgroup to trace all leaf items of data

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index dc49f0a..8f377ac 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -749,8 +749,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
                 */
                ret = btrfs_qgroup_trace_extent(trans,
                                btrfs_file_extent_disk_bytenr(eb, item),
-                               btrfs_file_extent_disk_num_bytes(eb, item),
-                               GFP_NOFS);
+                               btrfs_file_extent_disk_num_bytes(eb, item));
                if (ret < 0)
                        goto out;