summaryrefslogtreecommitdiff
path: root/libbcachefs/fs-common.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-12-11 17:25:34 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2021-12-11 17:26:14 -0500
commit39a6bf885d4d8e9a59879931216b4b0f7a2571eb (patch)
tree4cf0156d661dd1a0812ff884d42fdb36b067fbe9 /libbcachefs/fs-common.c
parent2fc5a50bd67ec1d8d7930bbf9dfe03e86884277a (diff)
Update bcachefs sources to 6bb1ba5c94 bcachefs: Improve alloc_mem_to_key()
Diffstat (limited to 'libbcachefs/fs-common.c')
-rw-r--r--libbcachefs/fs-common.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libbcachefs/fs-common.c b/libbcachefs/fs-common.c
index 5f3429e9..d543480b 100644
--- a/libbcachefs/fs-common.c
+++ b/libbcachefs/fs-common.c
@@ -329,6 +329,7 @@ bool bch2_reinherit_attrs(struct bch_inode_unpacked *dst_u,
bool ret = false;
for (id = 0; id < Inode_opt_nr; id++) {
+ /* Skip attributes that were explicitly set on this inode */
if (dst_u->bi_fields_set & (1 << id))
continue;