diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-23 03:10:32 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-25 14:27:32 -0400 |
| commit | 826cae2f2b4d726b925f43bc208a571639da4761 (patch) | |
| tree | b7f83eecf3bde8c4e455d89c7c535988b3e8bd59 /fs/ext2 | |
| parent | 95203befa8887997f14077d8557e67d78457ee02 (diff) | |
| download | linux-826cae2f2b4d726b925f43bc208a571639da4761.tar.gz linux-826cae2f2b4d726b925f43bc208a571639da4761.tar.bz2 linux-826cae2f2b4d726b925f43bc208a571639da4761.zip | |
kill boilerplates around posix_acl_create_masq()
new helper: posix_acl_create(&acl, gfp, mode_p). Replaces acl with
modified clone, on failure releases acl and replaces with NULL.
Returns 0 or -ve on error. All callers of posix_acl_create_masq()
switched.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/acl.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 1226dbcc66f5..ba99fa4b2f35 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c @@ -270,29 +270,20 @@ ext2_init_acl(struct inode *inode, struct inode *dir) inode->i_mode &= ~current_umask(); } if (test_opt(inode->i_sb, POSIX_ACL) && acl) { - struct posix_acl *clone; - mode_t mode; - + mode_t mode = inode->i_mode; if (S_ISDIR(inode->i_mode)) { error = ext2_set_acl(inode, ACL_TYPE_DEFAULT, acl); if (error) goto cleanup; } - clone = posix_acl_clone(acl, GFP_KERNEL); - error = -ENOMEM; - if (!clone) - goto cleanup; - mode = inode->i_mode; - error = posix_acl_create_masq(clone, &mode); - if (error >= 0) { - inode->i_mode = mode; - if (error > 0) { - /* This is an extended ACL */ - error = ext2_set_acl(inode, - ACL_TYPE_ACCESS, clone); - } + error = posix_acl_create(&acl, GFP_KERNEL, &mode); + if (error < 0) + return error; + inode->i_mode = mode; + if (error > 0) { + /* This is an extended ACL */ + error = ext2_set_acl(inode, ACL_TYPE_ACCESS, acl); } - posix_acl_release(clone); } cleanup: posix_acl_release(acl); |