|
@@ -284,11 +284,11 @@ static struct dir_table_slot *find_index(struct inode *ip, u32 index,
|
|
release_metapage(*mp);
|
|
release_metapage(*mp);
|
|
*mp = NULL;
|
|
*mp = NULL;
|
|
}
|
|
}
|
|
- if (*mp == 0) {
|
|
|
|
|
|
+ if (!(*mp)) {
|
|
*lblock = blkno;
|
|
*lblock = blkno;
|
|
*mp = read_index_page(ip, blkno);
|
|
*mp = read_index_page(ip, blkno);
|
|
}
|
|
}
|
|
- if (*mp == 0) {
|
|
|
|
|
|
+ if (!(*mp)) {
|
|
jfs_err("free_index: error reading directory table");
|
|
jfs_err("free_index: error reading directory table");
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
@@ -413,7 +413,8 @@ static u32 add_index(tid_t tid, struct inode *ip, s64 bn, int slot)
|
|
}
|
|
}
|
|
ip->i_size = PSIZE;
|
|
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!");
|
|
jfs_err("add_index: get_metapage failed!");
|
|
xtTruncate(tid, ip, 0, COMMIT_PWMAP);
|
|
xtTruncate(tid, ip, 0, COMMIT_PWMAP);
|
|
memcpy(&jfs_ip->i_dirtable, temp_table,
|
|
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
|
|
} else
|
|
mp = read_index_page(ip, blkno);
|
|
mp = read_index_page(ip, blkno);
|
|
|
|
|
|
- if (mp == 0) {
|
|
|
|
|
|
+ if (!mp) {
|
|
jfs_err("add_index: get/read_metapage failed!");
|
|
jfs_err("add_index: get/read_metapage failed!");
|
|
goto clean_up;
|
|
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);
|
|
dirtab_slot = find_index(ip, index, &mp, &lblock);
|
|
|
|
|
|
- if (dirtab_slot == 0)
|
|
|
|
|
|
+ if (!dirtab_slot)
|
|
return;
|
|
return;
|
|
|
|
|
|
dirtab_slot->flag = DIR_INDEX_FREE;
|
|
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);
|
|
dirtab_slot = find_index(ip, index, mp, lblock);
|
|
|
|
|
|
- if (dirtab_slot == 0)
|
|
|
|
|
|
+ if (!dirtab_slot)
|
|
return;
|
|
return;
|
|
|
|
|
|
DTSaddress(dirtab_slot, bn);
|
|
DTSaddress(dirtab_slot, bn);
|
|
@@ -552,7 +553,7 @@ static int read_index(struct inode *ip, u32 index,
|
|
struct dir_table_slot *slot;
|
|
struct dir_table_slot *slot;
|
|
|
|
|
|
slot = find_index(ip, index, &mp, &lblock);
|
|
slot = find_index(ip, index, &mp, &lblock);
|
|
- if (slot == 0) {
|
|
|
|
|
|
+ if (!slot) {
|
|
return -EIO;
|
|
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;
|
|
struct super_block *sb = ip->i_sb;
|
|
|
|
|
|
ciKey.name = kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), GFP_NOFS);
|
|
ciKey.name = kmalloc((JFS_NAME_MAX + 1) * sizeof(wchar_t), GFP_NOFS);
|
|
- if (ciKey.name == 0) {
|
|
|
|
|
|
+ if (!ciKey.name) {
|
|
rc = -ENOMEM;
|
|
rc = -ENOMEM;
|
|
goto dtSearch_Exit2;
|
|
goto dtSearch_Exit2;
|
|
}
|
|
}
|
|
@@ -956,7 +957,7 @@ static int dtSplitUp(tid_t tid,
|
|
sp = DT_PAGE(ip, smp);
|
|
sp = DT_PAGE(ip, smp);
|
|
|
|
|
|
key.name = kmalloc((JFS_NAME_MAX + 2) * sizeof(wchar_t), GFP_NOFS);
|
|
key.name = kmalloc((JFS_NAME_MAX + 2) * sizeof(wchar_t), GFP_NOFS);
|
|
- if (key.name == 0) {
|
|
|
|
|
|
+ if (!key.name) {
|
|
DT_PUTPAGE(smp);
|
|
DT_PUTPAGE(smp);
|
|
rc = -ENOMEM;
|
|
rc = -ENOMEM;
|
|
goto dtSplitUp_Exit;
|
|
goto dtSplitUp_Exit;
|