Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_vfsops.c

diff --git a/fs/xfs/xfs_vfsops.c b/fs/xfs/xfs_vfsops.c
index 94f0858699b5e483c76ea6c13b7c8f8632091a9a..7bdbd991ab1cdd63300cc1eb7897b469d1a11abf 100644 (file)
--- a/fs/xfs/xfs_vfsops.c
+++ b/fs/xfs/xfs_vfsops.c
@@ -1687,7 +1687,7 @@ xfs_parseargs(
 #endif
 
        if (!options)
-               return 0;
+               goto done;
 
        iosize = dsunit = dswidth = vol_dsunit = vol_dswidth = 0;
 
@@ -1867,9 +1867,9 @@ printk("XFS: irixsgid is now a sysctl(2) variable, option is deprecated.\n");
                args->sunit = args->swidth = 0;
        }
 
+done:
        if (args->flags & XFSMNT_32BITINODES)
                vfsp->vfs_flag |= VFS_32BITINODES;
-
        if (args->flags2)
                args->flags |= XFSMNT_FLAGS2;
        return 0;