summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2016-12-13 14:39:34 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-14 09:50:50 -0500
commitfef394f75bc17599c17287fbc437d4fb07a98583 (patch)
tree1642c0a345224f0e9e49682f51b0a51ada221521
parent694a0dee9c2d36a552f31a1b104733ed3f90f46d (diff)
btrfs: drop unused extent_op arg from btrfs_add_delayed_data_ref
btrfs_add_delayed_data_ref is always called with a NULL extent_op, so let's drop the argument. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/delayed-ref.c6
-rw-r--r--fs/btrfs/delayed-ref.h3
-rw-r--r--fs/btrfs/extent-tree.c7
3 files changed, 6 insertions, 10 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index ef724a5fc30e..c66f487b76a7 100644
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -829,15 +829,13 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,
829 struct btrfs_trans_handle *trans, 829 struct btrfs_trans_handle *trans,
830 u64 bytenr, u64 num_bytes, 830 u64 bytenr, u64 num_bytes,
831 u64 parent, u64 ref_root, 831 u64 parent, u64 ref_root,
832 u64 owner, u64 offset, u64 reserved, int action, 832 u64 owner, u64 offset, u64 reserved, int action)
833 struct btrfs_delayed_extent_op *extent_op)
834{ 833{
835 struct btrfs_delayed_data_ref *ref; 834 struct btrfs_delayed_data_ref *ref;
836 struct btrfs_delayed_ref_head *head_ref; 835 struct btrfs_delayed_ref_head *head_ref;
837 struct btrfs_delayed_ref_root *delayed_refs; 836 struct btrfs_delayed_ref_root *delayed_refs;
838 struct btrfs_qgroup_extent_record *record = NULL; 837 struct btrfs_qgroup_extent_record *record = NULL;
839 838
840 BUG_ON(extent_op && !extent_op->is_data);
841 ref = kmem_cache_alloc(btrfs_delayed_data_ref_cachep, GFP_NOFS); 839 ref = kmem_cache_alloc(btrfs_delayed_data_ref_cachep, GFP_NOFS);
842 if (!ref) 840 if (!ref)
843 return -ENOMEM; 841 return -ENOMEM;
@@ -859,7 +857,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,
859 } 857 }
860 } 858 }
861 859
862 head_ref->extent_op = extent_op; 860 head_ref->extent_op = NULL;
863 861
864 delayed_refs = &trans->transaction->delayed_refs; 862 delayed_refs = &trans->transaction->delayed_refs;
865 spin_lock(&delayed_refs->lock); 863 spin_lock(&delayed_refs->lock);
diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h
index 50947b5a9152..8a0220fb703c 100644
--- a/fs/btrfs/delayed-ref.h
+++ b/fs/btrfs/delayed-ref.h
@@ -250,8 +250,7 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info,
250 struct btrfs_trans_handle *trans, 250 struct btrfs_trans_handle *trans,
251 u64 bytenr, u64 num_bytes, 251 u64 bytenr, u64 num_bytes,
252 u64 parent, u64 ref_root, 252 u64 parent, u64 ref_root,
253 u64 owner, u64 offset, u64 reserved, int action, 253 u64 owner, u64 offset, u64 reserved, int action);
254 struct btrfs_delayed_extent_op *extent_op);
255int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info, 254int btrfs_add_delayed_extent_op(struct btrfs_fs_info *fs_info,
256 struct btrfs_trans_handle *trans, 255 struct btrfs_trans_handle *trans,
257 u64 bytenr, u64 num_bytes, 256 u64 bytenr, u64 num_bytes,
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index dcd2e798767e..42a3bfd87c8e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2089,7 +2089,7 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
2089 ret = btrfs_add_delayed_data_ref(fs_info, trans, bytenr, 2089 ret = btrfs_add_delayed_data_ref(fs_info, trans, bytenr,
2090 num_bytes, parent, root_objectid, 2090 num_bytes, parent, root_objectid,
2091 owner, offset, 0, 2091 owner, offset, 0,
2092 BTRFS_ADD_DELAYED_REF, NULL); 2092 BTRFS_ADD_DELAYED_REF);
2093 } 2093 }
2094 return ret; 2094 return ret;
2095} 2095}
@@ -7244,7 +7244,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans,
7244 num_bytes, 7244 num_bytes,
7245 parent, root_objectid, owner, 7245 parent, root_objectid, owner,
7246 offset, 0, 7246 offset, 0,
7247 BTRFS_DROP_DELAYED_REF, NULL); 7247 BTRFS_DROP_DELAYED_REF);
7248 } 7248 }
7249 return ret; 7249 return ret;
7250} 7250}
@@ -8194,8 +8194,7 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
8194 ret = btrfs_add_delayed_data_ref(fs_info, trans, ins->objectid, 8194 ret = btrfs_add_delayed_data_ref(fs_info, trans, ins->objectid,
8195 ins->offset, 0, 8195 ins->offset, 0,
8196 root_objectid, owner, offset, 8196 root_objectid, owner, offset,
8197 ram_bytes, BTRFS_ADD_DELAYED_EXTENT, 8197 ram_bytes, BTRFS_ADD_DELAYED_EXTENT);
8198 NULL);
8199 return ret; 8198 return ret;
8200} 8199}
8201 8200