tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Adrian Bunk and committed by
Linus Torvalds b5d5dfbd 77f1f67a

+1 -4
+1
fs/nfs/super.c
··· 44 44 #include <linux/vfs.h> 45 45 #include <linux/inet.h> 46 46 #include <linux/nfs_xdr.h> 47 + #include <linux/magic.h> 47 48 48 49 #include <asm/system.h> 49 50 #include <asm/uaccess.h>
-4
include/linux/nfsd/const.h
··· 30 30 31 31 #include <linux/sunrpc/msg_prot.h> 32 32 33 - #ifndef NFS_SUPER_MAGIC 34 - # define NFS_SUPER_MAGIC 0x6969 35 - #endif 36 - 37 33 /* 38 34 * Largest number of bytes we need to allocate for an NFS 39 35 * call or reply. Used to control buffer sizes. We use