isofs: fix build regression

[sfrench/cifs-2.6.git] / fs / isofs / inode.c

diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index 217a5e7815da6a896daeddb53d8200dcba56a303..447a24d77b894ef733412ba201cadcaa9a226f7e 100644 (file)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -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;
 }
@@ -514,9 +514,11 @@ static int isofs_show_options(struct seq_file *m, struct dentry *root)
        if (sbi->s_fmode != ISOFS_INVALID_MODE)
                seq_printf(m, ",fmode=%o", sbi->s_fmode);
 
+#ifdef CONFIG_JOLIET
        if (sbi->s_nls_iocharset &&
            strcmp(sbi->s_nls_iocharset->charset, CONFIG_NLS_DEFAULT) != 0)
                seq_printf(m, ",iocharset=%s", sbi->s_nls_iocharset->charset);
+#endif
        return 0;
 }
 
@@ -678,7 +680,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;
@@ -737,12 +739,12 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent)
 
 root_found:
        /* We don't support read-write mounts */
-       if (!(s->s_flags & MS_RDONLY)) {
+       if (!sb_rdonly(s)) {
                error = -EACCES;
                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
                 */
@@ -1298,7 +1300,7 @@ static int isofs_read_inode(struct inode *inode, int relocated)
        unsigned long bufsize = ISOFS_BUFFER_SIZE(inode);
        unsigned long block;
        int high_sierra = sbi->s_high_sierra;
-       struct buffer_head *bh = NULL;
+       struct buffer_head *bh;
        struct iso_directory_record *de;
        struct iso_directory_record *tmpde = NULL;
        unsigned int de_len;
@@ -1320,8 +1322,7 @@ static int isofs_read_inode(struct inode *inode, int relocated)
                int frag1 = bufsize - offset;
 
                tmpde = kmalloc(de_len, GFP_KERNEL);
-               if (tmpde == NULL) {
-                       printk(KERN_INFO "%s: out of memory\n", __func__);
+               if (!tmpde) {
                        ret = -ENOMEM;
                        goto fail;
                }