summaryrefslogtreecommitdiff
path: root/libbcachefs/acl.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2025-07-19 14:29:30 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2025-07-19 14:29:30 -0400
commite17d8841efa4fa17150025eac9dd32a4b4610fc7 (patch)
tree1b685d8a4eaad56874d899839a519c696e3dc8a4 /libbcachefs/acl.c
parentffe083c31d0a387e5092e1709daf717c21c2a98d (diff)
Update bcachefs sources to c1ec91699f60 workqueue: Basic memory allocation profiling supportv1.25.3
Diffstat (limited to 'libbcachefs/acl.c')
-rw-r--r--libbcachefs/acl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libbcachefs/acl.c b/libbcachefs/acl.c
index 307824d6..8f970dc1 100644
--- a/libbcachefs/acl.c
+++ b/libbcachefs/acl.c
@@ -138,8 +138,8 @@ static struct posix_acl *bch2_acl_from_disk(struct btree_trans *trans,
acl = allocate_dropping_locks(trans, ret,
posix_acl_alloc(count, _gfp));
- if (!acl)
- return ERR_PTR(-ENOMEM);
+ if (!acl && !ret)
+ ret = bch_err_throw(trans->c, ENOMEM_acl);
if (ret) {
kfree(acl);
return ERR_PTR(ret);