diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index 1884300417e3..68f4793e8a11 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -67,7 +67,8 @@ mempool_t *xfs_ioend_pool; | |||
67 | 67 | ||
68 | STATIC struct xfs_mount_args * | 68 | STATIC struct xfs_mount_args * |
69 | xfs_args_allocate( | 69 | xfs_args_allocate( |
70 | struct super_block *sb) | 70 | struct super_block *sb, |
71 | int silent) | ||
71 | { | 72 | { |
72 | struct xfs_mount_args *args; | 73 | struct xfs_mount_args *args; |
73 | 74 | ||
@@ -80,8 +81,8 @@ xfs_args_allocate( | |||
80 | args->flags |= XFSMNT_DIRSYNC; | 81 | args->flags |= XFSMNT_DIRSYNC; |
81 | if (sb->s_flags & MS_SYNCHRONOUS) | 82 | if (sb->s_flags & MS_SYNCHRONOUS) |
82 | args->flags |= XFSMNT_WSYNC; | 83 | args->flags |= XFSMNT_WSYNC; |
83 | 84 | if (silent) | |
84 | /* Default to 32 bit inodes on Linux all the time */ | 85 | args->flags |= XFSMNT_QUIET; |
85 | args->flags |= XFSMNT_32BITINODES; | 86 | args->flags |= XFSMNT_32BITINODES; |
86 | 87 | ||
87 | return args; | 88 | return args; |
@@ -719,7 +720,7 @@ xfs_fs_remount( | |||
719 | char *options) | 720 | char *options) |
720 | { | 721 | { |
721 | vfs_t *vfsp = vfs_from_sb(sb); | 722 | vfs_t *vfsp = vfs_from_sb(sb); |
722 | struct xfs_mount_args *args = xfs_args_allocate(sb); | 723 | struct xfs_mount_args *args = xfs_args_allocate(sb, 0); |
723 | int error; | 724 | int error; |
724 | 725 | ||
725 | VFS_PARSEARGS(vfsp, options, args, 1, error); | 726 | VFS_PARSEARGS(vfsp, options, args, 1, error); |
@@ -825,7 +826,7 @@ xfs_fs_fill_super( | |||
825 | { | 826 | { |
826 | vnode_t *rootvp; | 827 | vnode_t *rootvp; |
827 | struct vfs *vfsp = vfs_allocate(sb); | 828 | struct vfs *vfsp = vfs_allocate(sb); |
828 | struct xfs_mount_args *args = xfs_args_allocate(sb); | 829 | struct xfs_mount_args *args = xfs_args_allocate(sb, silent); |
829 | struct kstatfs statvfs; | 830 | struct kstatfs statvfs; |
830 | int error, error2; | 831 | int error, error2; |
831 | 832 | ||