diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-04 13:33:53 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-04 23:33:54 -0400 |
| commit | 07ec713e056a73337bc0f53f5910f5179537b2c2 (patch) | |
| tree | f43e435b6fb409f4dab4420be283690101904c7c /libbcachefs/acl.c | |
| parent | 55142cd0b5ef2a2150d4708dad0c3fd54a3ffd39 (diff) | |
Update bcachefs sources to 1a510b00b6 bcachefs: Increase BTREE_TRANS_MEM_MAX
Diffstat (limited to 'libbcachefs/acl.c')
| -rw-r--r-- | libbcachefs/acl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libbcachefs/acl.c b/libbcachefs/acl.c index 74cb188f..5408a922 100644 --- a/libbcachefs/acl.c +++ b/libbcachefs/acl.c @@ -370,7 +370,7 @@ int bch2_acl_chmod(struct btree_trans *trans, acl = bch2_acl_from_disk(xattr_val(xattr.v), le16_to_cpu(xattr.v->x_val_len)); ret = PTR_ERR_OR_ZERO(acl); - if (ret || !acl) + if (IS_ERR_OR_NULL(acl)) goto err; ret = __posix_acl_chmod(&acl, GFP_KERNEL, mode); @@ -389,7 +389,8 @@ int bch2_acl_chmod(struct btree_trans *trans, acl = NULL; err: bch2_trans_iter_put(trans, iter); - kfree(acl); + if (!IS_ERR_OR_NULL(acl)) + kfree(acl); return ret; } |