ALSA: pcm: potential uninitialized return values

[pandora-kernel.git] / fs / generic_acl.c

diff --git a/fs/generic_acl.c b/fs/generic_acl.c
index d0dddac..a3f3e70 100644 (file)
--- a/fs/generic_acl.c
+++ b/fs/generic_acl.c
@@ -86,16 +86,17 @@ generic_acl_set(struct dentry *dentry, const char *name, const void *value,
                if (error)
                        goto failed;
                switch (type) {
-               case ACL_TYPE_ACCESS:
-                       error = posix_acl_equiv_mode(acl, &inode->i_mode);
-                       if (error < 0)
+               case ACL_TYPE_ACCESS: {
+                       struct posix_acl *saved_acl = acl;
+
+                       error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+                       if (acl == NULL)
+                               posix_acl_release(saved_acl);
+                       if (error)
                                goto failed;
                        inode->i_ctime = CURRENT_TIME;
-                       if (error == 0) {
-                               posix_acl_release(acl);
-                               acl = NULL;
-                       }
                        break;
+               }
                case ACL_TYPE_DEFAULT:
                        if (!S_ISDIR(inode->i_mode)) {
                                error = -EINVAL;