From b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5 Mon Sep 17 00:00:00 2001 From: Adrian Bunk <bunk@stusta.de> Date: Mon, 12 Feb 2007 00:53:40 -0800 Subject: [PATCH] [PATCH] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC NFS_SUPER_MAGIC is already defined in include/linux/magic.h Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- fs/nfs/super.c | 1 + include/linux/nfsd/const.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 28108c82b8874..76b980097621c 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -44,6 +44,7 @@ #include <linux/vfs.h> #include <linux/inet.h> #include <linux/nfs_xdr.h> +#include <linux/magic.h> #include <asm/system.h> #include <asm/uaccess.h> diff --git a/include/linux/nfsd/const.h b/include/linux/nfsd/const.h index f0cc777905270..323f8cfa060a4 100644 --- a/include/linux/nfsd/const.h +++ b/include/linux/nfsd/const.h @@ -30,10 +30,6 @@ #include <linux/sunrpc/msg_prot.h> -#ifndef NFS_SUPER_MAGIC -# define NFS_SUPER_MAGIC 0x6969 -#endif - /* * Largest number of bytes we need to allocate for an NFS * call or reply. Used to control buffer sizes. We use -- GitLab