[PATCH] Add GFP_NOWAIT

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

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 8355faf8ffded885d3557322b48b0ffd2f9b28fe..68f4793e8a11f27588a3d211ec00a07303f3bca3 100644 (file)
--- 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;
 
 STATIC struct xfs_mount_args *
 xfs_args_allocate(
-       struct super_block      *sb)
+       struct super_block      *sb,
+       int                     silent)
 {
        struct xfs_mount_args   *args;
 
@@ -80,8 +81,8 @@ xfs_args_allocate(
                args->flags |= XFSMNT_DIRSYNC;
        if (sb->s_flags & MS_SYNCHRONOUS)
                args->flags |= XFSMNT_WSYNC;
-
-       /* Default to 32 bit inodes on Linux all the time */
+       if (silent)
+               args->flags |= XFSMNT_QUIET;
        args->flags |= XFSMNT_32BITINODES;
 
        return args;
@@ -375,9 +376,8 @@ xfs_init_zones(void)
        if (!xfs_ioend_zone)
                goto out_destroy_vnode_zone;
 
-       xfs_ioend_pool = mempool_create(4 * MAX_BUF_PER_PAGE,
-                                       mempool_alloc_slab, mempool_free_slab,
-                                       xfs_ioend_zone);
+       xfs_ioend_pool = mempool_create_slab_pool(4 * MAX_BUF_PER_PAGE,
+                                                 xfs_ioend_zone);
        if (!xfs_ioend_pool)
                goto out_free_ioend_zone;
        return 0;
@@ -720,7 +720,7 @@ xfs_fs_remount(
        char                    *options)
 {
        vfs_t                   *vfsp = vfs_from_sb(sb);
-       struct xfs_mount_args   *args = xfs_args_allocate(sb);
+       struct xfs_mount_args   *args = xfs_args_allocate(sb, 0);
        int                     error;
 
        VFS_PARSEARGS(vfsp, options, args, 1, error);
@@ -826,7 +826,7 @@ xfs_fs_fill_super(
 {
        vnode_t                 *rootvp;
        struct vfs              *vfsp = vfs_allocate(sb);
-       struct xfs_mount_args   *args = xfs_args_allocate(sb);
+       struct xfs_mount_args   *args = xfs_args_allocate(sb, silent);
        struct kstatfs          statvfs;
        int                     error, error2;