Merge tag 'kbuild-fixes-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahi...

[linux-2.6-microblaze.git] / fs / bcachefs / fs.c

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index a2a5133..8ef8173 100644 (file)
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -764,15 +764,15 @@ static int bch2_getattr(struct mnt_idmap *idmap,
                stat->btime = bch2_time_to_timespec(c, inode->ei_inode.bi_otime);
        }
 
-       if (inode->ei_inode.bi_flags & BCH_INODE_IMMUTABLE)
+       if (inode->ei_inode.bi_flags & BCH_INODE_immutable)
                stat->attributes |= STATX_ATTR_IMMUTABLE;
        stat->attributes_mask    |= STATX_ATTR_IMMUTABLE;
 
-       if (inode->ei_inode.bi_flags & BCH_INODE_APPEND)
+       if (inode->ei_inode.bi_flags & BCH_INODE_append)
                stat->attributes |= STATX_ATTR_APPEND;
        stat->attributes_mask    |= STATX_ATTR_APPEND;
 
-       if (inode->ei_inode.bi_flags & BCH_INODE_NODUMP)
+       if (inode->ei_inode.bi_flags & BCH_INODE_nodump)
                stat->attributes |= STATX_ATTR_NODUMP;
        stat->attributes_mask    |= STATX_ATTR_NODUMP;
 
@@ -1213,9 +1213,6 @@ static struct dentry *bch2_get_parent(struct dentry *child)
                .inum = inode->ei_inode.bi_dir,
        };
 
-       if (!parent_inum.inum)
-               return NULL;
-
        return d_obtain_alias(bch2_vfs_inode_get(c, parent_inum));
 }
 
@@ -1925,10 +1922,7 @@ out:
        return dget(sb->s_root);
 
 err_put_super:
-       sb->s_fs_info = NULL;
-       c->vfs_sb = NULL;
        deactivate_locked_super(sb);
-       bch2_fs_stop(c);
        return ERR_PTR(bch2_err_class(ret));
 }
 
@@ -1936,11 +1930,8 @@ static void bch2_kill_sb(struct super_block *sb)
 {
        struct bch_fs *c = sb->s_fs_info;
 
-       if (c)
-               c->vfs_sb = NULL;
        generic_shutdown_super(sb);
-       if (c)
-               bch2_fs_free(c);
+       bch2_fs_free(c);
 }
 
 static struct file_system_type bcache_fs_type = {