Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[linux-beck.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 867eaf1f8efb8a9abc3d442012c3ecef6121b7d4..7fdd184a528d11caa58ddb37f8d59d07de17a517 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -161,8 +161,7 @@ static int btrfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
        ret = __btrfs_setxattr(inode, name, value, size, 0);
 
 out:
-       if (value)
-               kfree(value);
+       kfree(value);
 
        if (!ret)
                btrfs_update_cached_acl(inode, p_acl, acl);
@@ -213,7 +212,7 @@ static int btrfs_xattr_acl_default_get(struct inode *inode, const char *name,
 }
 
 static int btrfs_xattr_acl_default_set(struct inode *inode, const char *name,
-                                      const void *value, size_t size, int flags)
+                              const void *value, size_t size, int flags)
 {
        return btrfs_xattr_set_acl(inode, ACL_TYPE_DEFAULT, value, size);
 }
@@ -257,7 +256,7 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir)
                }
 
                if (!acl)
-                       inode->i_mode &= ~current->fs->umask;
+                       inode->i_mode &= ~current_umask();
        }
 
        if (IS_POSIXACL(dir) && acl) {