[PATCH] isofs: conditional removal of NFSD code

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---

 fs/isofs/Makefile |    5 +++--
 fs/isofs/inode.c  |    2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

--- a/fs/isofs/Makefile
+++ b/fs/isofs/Makefile
@@ -4,7 +4,8 @@ #
 
 obj-$(CONFIG_ISO9660_FS) += isofs.o
 
-isofs-objs-y 			:= namei.o inode.o dir.o util.o rock.o export.o
+isofs-objs-y 			:= namei.o inode.o dir.o util.o rock.o
+isofs-objs-$(CONFIG_EXPORTFS)	+= export.o
 isofs-objs-$(CONFIG_JOLIET)	+= joliet.o
 isofs-objs-$(CONFIG_ZISOFS)	+= compress.o
-isofs-objs			:= $(isofs-objs-y)
+isofs-objs			:= $(isofs-objs-y) $(isofs-objs-m)
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -784,7 +784,9 @@ #ifdef CONFIG_JOLIET
 	}
 #endif
 	s->s_op = &isofs_sops;
+#if defined(CONFIG_EXPORTFS) || defined(CONFIG_EXPORTFS_MODULE)
 	s->s_export_op = &isofs_export_ops;
+#endif
 	sbi->s_mapping = opt.map;
 	sbi->s_rock = (opt.rock == 'y' ? 2 : 0);
 	sbi->s_rock_offset = -1; /* initial offset, will guess until SP is found*/

-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]
  Powered by Linux