|
@@ -96,7 +96,7 @@ static int __init init_inodecache(void)
|
|
|
0, (SLAB_RECLAIM_ACCOUNT|
|
|
|
SLAB_MEM_SPREAD|SLAB_ACCOUNT),
|
|
|
init_once);
|
|
|
- if (isofs_inode_cachep == NULL)
|
|
|
+ if (!isofs_inode_cachep)
|
|
|
return -ENOMEM;
|
|
|
return 0;
|
|
|
}
|
|
@@ -678,7 +678,7 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
|
|
|
if (isonum_711(vdp->type) == ISO_VD_END)
|
|
|
break;
|
|
|
if (isonum_711(vdp->type) == ISO_VD_PRIMARY) {
|
|
|
- if (pri == NULL) {
|
|
|
+ if (!pri) {
|
|
|
pri = (struct iso_primary_descriptor *)vdp;
|
|
|
/* Save the buffer in case we need it ... */
|
|
|
pri_bh = bh;
|
|
@@ -742,7 +742,7 @@ root_found:
|
|
|
goto out_freebh;
|
|
|
}
|
|
|
|
|
|
- if (joliet_level && (pri == NULL || !opt.rock)) {
|
|
|
+ if (joliet_level && (!pri || !opt.rock)) {
|
|
|
/* This is the case of Joliet with the norock mount flag.
|
|
|
* A disc with both Joliet and Rock Ridge is handled later
|
|
|
*/
|
|
@@ -1320,7 +1320,7 @@ static int isofs_read_inode(struct inode *inode, int relocated)
|
|
|
int frag1 = bufsize - offset;
|
|
|
|
|
|
tmpde = kmalloc(de_len, GFP_KERNEL);
|
|
|
- if (tmpde == NULL) {
|
|
|
+ if (!tmpde) {
|
|
|
ret = -ENOMEM;
|
|
|
goto fail;
|
|
|
}
|