]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
bcachefs: bch2_inode_should_have_bp -> bch2_inode_should_have_single_bp
authorKent Overstreet <kent.overstreet@linux.dev>
Sat, 28 Sep 2024 18:27:24 +0000 (14:27 -0400)
committerKent Overstreet <kent.overstreet@linux.dev>
Sat, 21 Dec 2024 06:36:14 +0000 (01:36 -0500)
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
fs/bcachefs/fs.c
fs/bcachefs/fsck.c
fs/bcachefs/inode.h

index a41d0d8a2f7beb8c281f32489ba5b76b7cf1ba77..646b74494a3f3514102fa1f45bcb16f32d9e9401 100644 (file)
@@ -628,7 +628,7 @@ static struct bch_inode_info *bch2_lookup_trans(struct btree_trans *trans,
                goto err;
 
        /* regular files may have hardlinks: */
-       if (bch2_fs_inconsistent_on(bch2_inode_should_have_bp(&inode_u) &&
+       if (bch2_fs_inconsistent_on(bch2_inode_should_have_single_bp(&inode_u) &&
                                    !bkey_eq(k.k->p, POS(inode_u.bi_dir, inode_u.bi_dir_offset)),
                                    c,
                                    "dirent points to inode that does not point back:\n  %s",
index 75c8a97a6954c6a91f8a6b9d6d28f181ac69c8e4..285de12436ddc2eee33b35fe3b1a79ad161a5929 100644 (file)
@@ -2156,7 +2156,7 @@ static int check_dirent_inode_dirent(struct btree_trans *trans,
                return __bch2_fsck_write_inode(trans, target);
        }
 
-       if (bch2_inode_should_have_bp(target) &&
+       if (bch2_inode_should_have_single_bp(target) &&
            !fsck_err(trans, inode_wrong_backpointer,
                      "dirent points to inode that does not point back:\n  %s",
                      (bch2_bkey_val_to_text(&buf, c, d.s_c),
index eab82b5eb8977d8c6e8120b55fce870f8ffec26a..bdeb6be76038ab907f7f79f275874b3fabe170fa 100644 (file)
@@ -249,7 +249,7 @@ static inline void bch2_inode_nlink_set(struct bch_inode_unpacked *bi,
 int bch2_inode_nlink_inc(struct bch_inode_unpacked *);
 void bch2_inode_nlink_dec(struct btree_trans *, struct bch_inode_unpacked *);
 
-static inline bool bch2_inode_should_have_bp(struct bch_inode_unpacked *inode)
+static inline bool bch2_inode_should_have_single_bp(struct bch_inode_unpacked *inode)
 {
        bool inode_has_bp = inode->bi_dir || inode->bi_dir_offset;