diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-01 15:07:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-01 15:07:56 -0800 |
| commit | a86bf2283d2c9769205407e2b54777c03d012939 (patch) | |
| tree | 590ff51c17884f1f2c0da042c8febd8c1ce0780a /fs/bcachefs | |
| parent | c270ab5a87403f9365c00d3c587aa8000560bdc3 (diff) | |
| parent | c1feab95e0b2e9fce7e4f4b2739baf40d84543af (diff) | |
| download | linux-a86bf2283d2c9769205407e2b54777c03d012939.tar.gz linux-a86bf2283d2c9769205407e2b54777c03d012939.tar.bz2 linux-a86bf2283d2c9769205407e2b54777c03d012939.zip | |
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs cleanups from Al Viro:
"Two unrelated patches - one is a removal of long-obsolete include in
overlayfs (it used to need fs/internal.h, but the extern it wanted has
been moved back to include/linux/namei.h) and another introduces
convenience helper constructing struct qstr by a NUL-terminated
string"
* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
add a string-to-qstr constructor
fs/overlayfs/namei.c: get rid of include ../internal.h
Diffstat (limited to 'fs/bcachefs')
| -rw-r--r-- | fs/bcachefs/fsck.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/recovery.c | 1 | ||||
| -rw-r--r-- | fs/bcachefs/util.h | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c index 8fcf7c8e5ede..53a421ff136d 100644 --- a/fs/bcachefs/fsck.c +++ b/fs/bcachefs/fsck.c @@ -450,7 +450,7 @@ static int reattach_inode(struct btree_trans *trans, struct bch_inode_unpacked * return ret; struct bch_hash_info dir_hash = bch2_hash_info_init(c, &lostfound); - struct qstr name = (struct qstr) QSTR(name_buf); + struct qstr name = QSTR(name_buf); inode->bi_dir = lostfound.bi_inum; diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 98825437381c..71c786cdb192 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -32,7 +32,6 @@ #include <linux/sort.h> #include <linux/stat.h> -#define QSTR(n) { { { .len = strlen(n) } }, .name = n } int bch2_btree_lost_data(struct bch_fs *c, enum btree_id btree) { diff --git a/fs/bcachefs/util.h b/fs/bcachefs/util.h index 1a1720116071..e7c3541b38f3 100644 --- a/fs/bcachefs/util.h +++ b/fs/bcachefs/util.h @@ -670,8 +670,6 @@ static inline int cmp_le32(__le32 l, __le32 r) #include <linux/uuid.h> -#define QSTR(n) { { { .len = strlen(n) } }, .name = n } - static inline bool qstr_eq(const struct qstr l, const struct qstr r) { return l.len == r.len && !memcmp(l.name, r.name, l.len); |