mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 11:16:11 +00:00
JFS: Remove defconfig ptr comparison to 0
Remove sparse warning: Using plain integer as NULL pointer Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
This commit is contained in:
parent
a7fe0ba7ee
commit
09aaa749f6
5 changed files with 15 additions and 14 deletions
|
@ -284,11 +284,11 @@ static struct dir_table_slot *find_index(struct inode *ip, u32 index,
|
|||
release_metapage(*mp);
|
||||
*mp = NULL;
|
||||
}
|
||||
if (*mp == 0) {
|
||||
if (!(*mp)) {
|
||||
*lblock = blkno;
|
||||
*mp = read_index_page(ip, blkno);
|
||||
}
|
||||
if (*mp == 0) {
|
||||
if (!(*mp)) {
|
||||
jfs_err("free_index: error reading directory table");
|
||||
return NULL;
|
||||
}
|
||||
|
@ -413,7 +413,8 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
|
|||
}
|
||||
ip->i_size = PSIZE;
|
||||
|
||||
if ((mp = get_index_page(ip, 0)) == 0) {
|
||||
mp = get_index_page(ip, 0);
|
||||
if (!mp) {
|
||||
jfs_err("add_index: get_metapage failed!");
|
||||
xtTruncate(tid, ip, 0, COMMIT_PWMAP);
|
||||
memcpy(&jfs_ip->i_dirtable, temp_table,
|
||||
|
@ -461,7 +462,7 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
|
|||
} else
|
||||
mp = read_index_page(ip, blkno);
|
||||
|
||||
if (mp == 0) {
|
||||
if (!mp) {
|
||||
jfs_err("add_index: get/read_metapage failed!");
|
||||
goto clean_up;
|
||||
}
|
||||
|
@ -499,7 +500,7 @@ static void free_index(tid_t tid, struct inode *ip, u32 index, u32 next)
|
|||
|
||||
dirtab_slot = find_index(ip, index, &mp, &lblock);
|
||||
|
||||
if (dirtab_slot == 0)
|
||||
if (!dirtab_slot)
|
||||
return;
|
||||
|
||||
dirtab_slot->flag = DIR_INDEX_FREE;
|
||||
|
@ -526,7 +527,7 @@ static void modify_index(tid_t tid, struct inode *ip, u32 index, s64 bn,
|
|||
|
||||
dirtab_slot = find_index(ip, index, mp, lblock);
|
||||
|
||||
if (dirtab_slot == 0)
|
||||
if (!dirtab_slot)
|
||||
return;
|
||||
|
||||
DTSaddress(dirtab_slot, bn);
|
||||
|
@ -552,7 +553,7 @@ static int read_index(struct inode *ip, u32 index,
|
|||
struct dir_table_slot *slot;
|
||||
|
||||
slot = find_index(ip, index, &mp, &lblock);
|
||||
if (slot == 0) {
|
||||
if (!slot) {
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
@ -593,7 +594,7 @@ int dtSearch(struct inode *ip, struct component_name * key, ino_t * data,
|
|||
struct super_block *sb = ip->i_sb;
|
||||
|
||||
ciKey.name = kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), GFP_NOFS);
|
||||
if (ciKey.name == 0) {
|
||||
if (!ciKey.name) {
|
||||
rc = -ENOMEM;
|
||||
goto dtSearch_Exit2;
|
||||
}
|
||||
|
@ -956,7 +957,7 @@ static int dtSplitUp(tid_t tid,
|
|||
sp = DT_PAGE(ip, smp);
|
||||
|
||||
key.name = kmalloc((JFS_NAME_MAX + 2) * sizeof(wchar_t), GFP_NOFS);
|
||||
if (key.name == 0) {
|
||||
if (!key.name) {
|
||||
DT_PUTPAGE(smp);
|
||||
rc = -ENOMEM;
|
||||
goto dtSplitUp_Exit;
|
||||
|
|
|
@ -381,7 +381,7 @@ int diRead(struct inode *ip)
|
|||
|
||||
/* read the page of disk inode */
|
||||
mp = read_metapage(ipimap, pageno << sbi->l2nbperpage, PSIZE, 1);
|
||||
if (mp == 0) {
|
||||
if (!mp) {
|
||||
jfs_err("diRead: read_metapage failed");
|
||||
return -EIO;
|
||||
}
|
||||
|
@ -654,7 +654,7 @@ int diWrite(tid_t tid, struct inode *ip)
|
|||
/* read the page of disk inode */
|
||||
retry:
|
||||
mp = read_metapage(ipimap, pageno << sbi->l2nbperpage, PSIZE, 1);
|
||||
if (mp == 0)
|
||||
if (!mp)
|
||||
return -EIO;
|
||||
|
||||
/* get the pointer to the disk inode */
|
||||
|
|
|
@ -2345,7 +2345,7 @@ int jfsIOWait(void *arg)
|
|||
|
||||
do {
|
||||
spin_lock_irq(&log_redrive_lock);
|
||||
while ((bp = log_redrive_list) != 0) {
|
||||
while ((bp = log_redrive_list)) {
|
||||
log_redrive_list = bp->l_redrive_next;
|
||||
bp->l_redrive_next = NULL;
|
||||
spin_unlock_irq(&log_redrive_lock);
|
||||
|
|
|
@ -147,7 +147,7 @@ int jfs_mount(struct super_block *sb)
|
|||
*/
|
||||
if ((sbi->mntflag & JFS_BAD_SAIT) == 0) {
|
||||
ipaimap2 = diReadSpecial(sb, AGGREGATE_I, 1);
|
||||
if (ipaimap2 == 0) {
|
||||
if (!ipaimap2) {
|
||||
jfs_err("jfs_mount: Faild to read AGGREGATE_I");
|
||||
rc = -EIO;
|
||||
goto errout35;
|
||||
|
|
|
@ -1103,7 +1103,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|||
* Make sure dest inode number (if any) is what we think it is
|
||||
*/
|
||||
rc = dtSearch(new_dir, &new_dname, &ino, &btstack, JFS_LOOKUP);
|
||||
if (rc == 0) {
|
||||
if (!rc) {
|
||||
if ((new_ip == 0) || (ino != new_ip->i_ino)) {
|
||||
rc = -ESTALE;
|
||||
goto out3;
|
||||
|
|
Loading…
Reference in a new issue