Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / fs / befs / linuxvfs.c

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index a16fbd4e824107fefa27ecde2a86bf1902b04821..4cf61ec6b7a8ee539e0caa63d548f8aa4222ad0f 100644 (file)
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -799,13 +799,11 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
 
        befs_debug(sb, "---> %s", __func__);
 
-#ifndef CONFIG_BEFS_RW
        if (!(sb->s_flags & MS_RDONLY)) {
                befs_warning(sb,
                             "No write support. Marking filesystem read-only");
                sb->s_flags |= MS_RDONLY;
        }
-#endif                         /* CONFIG_BEFS_RW */
 
        /*
         * Set dummy blocksize to read super block.
@@ -834,16 +832,14 @@ befs_fill_super(struct super_block *sb, void *data, int silent)
                    (befs_super_block *) ((void *) bh->b_data + x86_sb_off);
        }
 
-       if (befs_load_sb(sb, disk_sb) != BEFS_OK)
+       if ((befs_load_sb(sb, disk_sb) != BEFS_OK) ||
+           (befs_check_sb(sb) != BEFS_OK))
                goto unacquire_bh;
 
        befs_dump_super_block(sb, disk_sb);
 
        brelse(bh);
 
-       if (befs_check_sb(sb) != BEFS_OK)
-               goto unacquire_priv_sbp;
-
        if( befs_sb->num_blocks > ~((sector_t)0) ) {
                befs_error(sb, "blocks count: %llu "
                        "is larger than the host can use",