summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-06-19 08:40:27 +1000
committerNathan Scott <nathans@sgi.com>2006-06-19 08:40:27 +1000
commita805bad5daae8d4f92ce46f467484d4867e996d4 (patch)
tree60a028285061b29b4b86935dec699c918d190d5a /fs
parent6fe90e6d1451a05db37b2a582410ddcb45af3606 (diff)
downloadop-kernel-dev-a805bad5daae8d4f92ce46f467484d4867e996d4.zip
op-kernel-dev-a805bad5daae8d4f92ce46f467484d4867e996d4.tar.gz
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/Kconfig6
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c4
2 files changed, 1 insertions, 9 deletions
diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig
index 236f9cf..26b364c 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 b7aad3c..7fae922 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;
OpenPOWER on IntegriCloud