lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

JFS: Remove redundant kfree() NULL pointer checks

Browse Source 
kfree() can handle a NULL pointer, don't worry about passing it one. 

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
This commit is contained in:
Jesper Juhl
2005-05-09 10:47:14 -05:00
committed by Dave Kleikamp
parent 6f817abc64
commit 259692bd5a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jfs/acl.c
View File

@@ -70,8 +70,7 @@ static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
if (!IS_ERR(acl)) if (!IS_ERR(acl))
*p_acl = posix_acl_dup(acl); *p_acl = posix_acl_dup(acl);
} }
if (value) kfree(value);
kfree(value);
return acl; return acl;
} }
@@ -112,8 +111,7 @@ static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
} }
rc = __jfs_setxattr(inode, ea_name, value, size, 0); rc = __jfs_setxattr(inode, ea_name, value, size, 0);
out: out:
if (value) kfree(value);
kfree(value);
if (!rc) { if (!rc) {
if (*p_acl && (*p_acl != JFS_ACL_NOT_CACHED)) if (*p_acl && (*p_acl != JFS_ACL_NOT_CACHED))

6
fs/jfs/xattr.c
View File

@@ -946,8 +946,7 @@ int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
out: out:
up_write(&JFS_IP(inode)->xattr_sem); up_write(&JFS_IP(inode)->xattr_sem);
if (os2name) kfree(os2name);
kfree(os2name);
return rc; return rc;
} }
@@ -1042,8 +1041,7 @@ ssize_t __jfs_getxattr(struct inode *inode, const char *name, void *data,
out: out:
up_read(&JFS_IP(inode)->xattr_sem); up_read(&JFS_IP(inode)->xattr_sem);
if (os2name) kfree(os2name);
kfree(os2name);
return size; return size;
} }