diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 06:18:02 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 20:27:30 +0200 |
| commit | bc26ab5f65ae41b71df86ea46df3c3833d1d8d83 (patch) | |
| tree | 85bbc4e0da4fac99ccf31b3609c61e2b148a8498 /fs/posix_acl.c | |
| parent | reiserfs: cache negative ACLs for v1 stat format (diff) | |
| download | linux-bc26ab5f65ae41b71df86ea46df3c3833d1d8d83.tar.xz linux-bc26ab5f65ae41b71df86ea46df3c3833d1d8d83.zip | |
kill boilerplate around posix_acl_chmod_masq()
new helper: posix_acl_chmod(&acl, gfp, mode). Replaces acl with modified
clone or with NULL if that has failed; returns 0 or -ve on error. All
callers of posix_acl_chmod_masq() switched to that - they'd been doing
exactly the same thing.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/posix_acl.c')
| -rw-r--r-- | fs/posix_acl.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/fs/posix_acl.c b/fs/posix_acl.c index b1cf6bf4b41d..0aa9f1676726 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -386,3 +386,21 @@ posix_acl_chmod_masq(struct posix_acl *acl, mode_t mode) return 0; } + +int +posix_acl_chmod(struct posix_acl **acl, gfp_t gfp, mode_t mode) +{ + struct posix_acl *clone = posix_acl_clone(*acl, gfp); + int err = -ENOMEM; + if (clone) { + err = posix_acl_chmod_masq(clone, mode); + if (err) { + posix_acl_release(clone); + clone = NULL; + } + } + posix_acl_release(*acl); + *acl = clone; + return err; +} +EXPORT_SYMBOL(posix_acl_chmod); |