diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-06-19 08:40:27 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-06-19 08:40:27 +1000 |
| commit | a805bad5daae8d4f92ce46f467484d4867e996d4 (patch) | |
| tree | 60a028285061b29b4b86935dec699c918d190d5a | |
| parent | 6fe90e6d1451a05db37b2a582410ddcb45af3606 (diff) | |
| download | linux-a805bad5daae8d4f92ce46f467484d4867e996d4.tar.bz2 | |
[XFS] Remove unneeded conditional code on NFS export interface related
code paths.
SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:26250a
Signed-off-by: Nathan Scott <nathans@sgi.com>
| -rw-r--r-- | fs/xfs/Kconfig | 6 | ||||
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig index 236f9cf3714f..26b364c9d62c 100644 --- a/fs/xfs/Kconfig +++ b/fs/xfs/Kconfig @@ -1,6 +1,5 @@ config XFS_FS tristate "XFS filesystem support" - select EXPORTFS if NFSD!=n help XFS is a high performance journaling filesystem which originated on the SGI IRIX platform. It is completely multi-threaded, can @@ -18,11 +17,6 @@ config XFS_FS system of your root partition is compiled as a module, you'll need to use an initial ramdisk (initrd) to boot. -config XFS_EXPORT - bool - depends on XFS_FS && EXPORTFS - default y - config XFS_QUOTA bool "XFS Quota support" depends on XFS_FS diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index b7aad3cfdfeb..7fae922d54de 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2005 Silicon Graphics, Inc. + * Copyright (c) 2000-2006 Silicon Graphics, Inc. * All Rights Reserved. * * This program is free software; you can redistribute it and/or @@ -796,9 +796,7 @@ xfs_fs_fill_super( } sb_min_blocksize(sb, BBSIZE); -#ifdef CONFIG_XFS_EXPORT sb->s_export_op = &xfs_export_operations; -#endif sb->s_qcop = &xfs_quotactl_operations; sb->s_op = &xfs_super_operations; |