Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a805bad5 authored by Nathan Scott's avatar Nathan Scott
Browse files

[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: default avatarNathan Scott <nathans@sgi.com>
parent 6fe90e6d

fs/xfs/Kconfig

+0 −6
Original line number Original line Diff line number Diff line 
config XFS_FS

config XFS_FS

	tristate "XFS filesystem support"

	tristate "XFS filesystem support"

	select EXPORTFS if NFSD!=n

	help

	help

	  XFS is a high performance journaling filesystem which originated

	  XFS is a high performance journaling filesystem which originated

	  on the SGI IRIX platform.  It is completely multi-threaded, can

	  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

	  system of your root partition is compiled as a module, you'll need

	  to use an initial ramdisk (initrd) to boot.

	  to use an initial ramdisk (initrd) to boot.





config XFS_EXPORT

	bool

	depends on XFS_FS && EXPORTFS

	default y



config XFS_QUOTA

config XFS_QUOTA

	bool "XFS Quota support"

	bool "XFS Quota support"

	depends on XFS_FS

	depends on XFS_FS

fs/xfs/linux-2.6/xfs_super.c

+1 −3
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2000-2005 Silicon Graphics, Inc.

 * Copyright (c) 2000-2006 Silicon Graphics, Inc.

 * All Rights Reserved.

 * All Rights Reserved.

 *

 *

 * This program is free software; you can redistribute it and/or

 * This program is free software; you can redistribute it and/or
@@ -796,9 +796,7 @@ xfs_fs_fill_super( 
	}

	}





	sb_min_blocksize(sb, BBSIZE);

	sb_min_blocksize(sb, BBSIZE);

#ifdef CONFIG_XFS_EXPORT

	sb->s_export_op = &xfs_export_operations;

	sb->s_export_op = &xfs_export_operations;

#endif

	sb->s_qcop = &xfs_quotactl_operations;

	sb->s_qcop = &xfs_quotactl_operations;

	sb->s_op = &xfs_super_operations;

	sb->s_op = &xfs_super_operations;