projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'ovl/misc' into work.misc
[cascardo/linux.git]
/
fs
/
posix_acl.c
diff --git
a/fs/posix_acl.c
b/fs/posix_acl.c
index
8cdcbb1
..
8719392
100644
(file)
--- a/
fs/posix_acl.c
+++ b/
fs/posix_acl.c
@@
-598,13
+598,14
@@
posix_acl_create(struct inode *dir, umode_t *mode,
if (IS_ERR(p))
return PTR_ERR(p);
if (IS_ERR(p))
return PTR_ERR(p);
+ ret = -ENOMEM;
clone = posix_acl_clone(p, GFP_NOFS);
if (!clone)
clone = posix_acl_clone(p, GFP_NOFS);
if (!clone)
- goto
no_mem
;
+ goto
err_release
;
ret = posix_acl_create_masq(clone, mode);
if (ret < 0)
ret = posix_acl_create_masq(clone, mode);
if (ret < 0)
- goto
no_mem
_clone;
+ goto
err_release
_clone;
if (ret == 0)
posix_acl_release(clone);
if (ret == 0)
posix_acl_release(clone);
@@
-618,11
+619,11
@@
posix_acl_create(struct inode *dir, umode_t *mode,
return 0;
return 0;
-
no_mem
_clone:
+
err_release
_clone:
posix_acl_release(clone);
posix_acl_release(clone);
-
no_mem
:
+
err_release
:
posix_acl_release(p);
posix_acl_release(p);
- return
-ENOMEM
;
+ return
ret
;
}
EXPORT_SYMBOL_GPL(posix_acl_create);
}
EXPORT_SYMBOL_GPL(posix_acl_create);