diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2020-12-07 16:32:36 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-02-08 22:58:50 +0100 |
| commit | 23125104d8485505cd19581025a3d6fc14e9945a (patch) | |
| tree | 749e513da2f0c46d71fcd6e32c09031bb82663d6 /fs/btrfs/inode.c | |
| parent | btrfs: rename btrfs_root::highest_objectid to free_objectid (diff) | |
| download | linux-23125104d8485505cd19581025a3d6fc14e9945a.tar.xz linux-23125104d8485505cd19581025a3d6fc14e9945a.zip | |
btrfs: make btrfs_root::free_objectid hold the next available objectid
Adjust the way free_objectid is being initialized, it now stores
BTRFS_FIRST_FREE_OBJECTID rather than the, somewhat arbitrary,
BTRFS_FIRST_FREE_OBJECTID - 1. This change also has the added benefit
that now it becomes unnecessary to explicitly initialize free_objectid
for a newly create fs root.
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>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 0fe4df05006d..356905d97656 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8598,9 +8598,13 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, struct inode *inode; int err; u64 index = 0; + u64 ino; + + err = btrfs_get_free_objectid(new_root, &ino); + if (err < 0) + return err; - inode = btrfs_new_inode(trans, new_root, NULL, "..", 2, - new_dirid, new_dirid, + inode = btrfs_new_inode(trans, new_root, NULL, "..", 2, ino, ino, S_IFDIR | (~current_umask() & S_IRWXUGO), &index); if (IS_ERR(inode)) |