diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-02-12 09:53:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 18:48:36 +0100 |
| commit | b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5 (patch) | |
| tree | 9ef320c6ff4f61bffb25c0452570d5f76ab7769c | |
| parent | [PATCH] knfsd: SUNRPC: fix up svc_create_socket() to take a sockaddr struct +... (diff) | |
| download | linux-b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5.tar.xz linux-b5d5dfbd59577aed72263f22e28d3eaf98e1c6e5.zip | |
[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>
| -rw-r--r-- | fs/nfs/super.c | 1 | ||||
| -rw-r--r-- | include/linux/nfsd/const.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 28108c82b887..76b980097621 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 f0cc77790527..323f8cfa060a 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 |