btrfs: remove new_dirid argument from btrfs_create_subvol_root

It's no longer used. While at it also remove new_dirid in create_subvol
as it's used in a single place and open code it. No functional changes.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index dc77aac2476cdb9fbf054d6495839c4273d9d37d..f5c636b29451fc20a19baadb7a2d5e5f045abcef 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3107,8 +3107,7 @@ int btrfs_set_extent_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
                              struct extent_state **cached_state);
 int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
                             struct btrfs_root *new_root,
                              struct extent_state **cached_state);
 int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
                             struct btrfs_root *new_root,

-                            struct btrfs_root *parent_root,
-                            u64 new_dirid);
+                            struct btrfs_root *parent_root);

  void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state,
                               unsigned *bits);
 void btrfs_clear_delalloc_extent(struct inode *inode,
  void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state,
                               unsigned *bits);
 void btrfs_clear_delalloc_extent(struct inode *inode,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 356905d976560a5fcb94b459eec4c151a93ff271..af5558f872438d97d7a5c53ae35d5cba98044fe6 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8592,8 +8592,7 @@ out:
  */
 int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
                             struct btrfs_root *new_root,
  */
 int btrfs_create_subvol_root(struct btrfs_trans_handle *trans,
                             struct btrfs_root *new_root,

-                            struct btrfs_root *parent_root,
-                            u64 new_dirid)
+                            struct btrfs_root *parent_root)

 {
        struct inode *inode;
        int err;
 {
        struct inode *inode;
        int err;

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index d8422074da024c21a13ba39c7c7161f7ce8b33a0..5b9b0a390f0ead9a93cc4e2f95517f16d587df1a 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -606,7 +606,6 @@ static noinline int create_subvol(struct inode *dir,
        int err;
        dev_t anon_dev = 0;
        u64 objectid;
        int err;
        dev_t anon_dev = 0;
        u64 objectid;

-       u64 new_dirid = BTRFS_FIRST_FREE_OBJECTID;

        u64 index = 0;
 
        root_item = kzalloc(sizeof(*root_item), GFP_KERNEL);
        u64 index = 0;
 
        root_item = kzalloc(sizeof(*root_item), GFP_KERNEL);


@@ -693,7 +692,7 @@ static noinline int create_subvol(struct inode *dir,
        free_extent_buffer(leaf);
        leaf = NULL;
 
        free_extent_buffer(leaf);
        leaf = NULL;
 

-       btrfs_set_root_dirid(root_item, new_dirid);
+       btrfs_set_root_dirid(root_item, BTRFS_FIRST_FREE_OBJECTID);

 
        key.objectid = objectid;
        key.offset = 0;
 
        key.objectid = objectid;
        key.offset = 0;


@@ -716,7 +715,7 @@ static noinline int create_subvol(struct inode *dir,
 
        btrfs_record_root_in_trans(trans, new_root);
 
 
        btrfs_record_root_in_trans(trans, new_root);
 

-       ret = btrfs_create_subvol_root(trans, new_root, root, new_dirid);
+       ret = btrfs_create_subvol_root(trans, new_root, root);

        btrfs_put_root(new_root);
        if (ret) {
                /* We potentially lose an unused inode item here */
        btrfs_put_root(new_root);
        if (ret) {
                /* We potentially lose an unused inode item here */