LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [2.6 patch] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC
@ 2007-01-11 13:49 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2007-01-11 13:49 UTC (permalink / raw)
To: Andrew Morton; +Cc: trond.myklebust, linux-kernel
NFS_SUPER_MAGIC is already defined in include/linux/magic.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
This patch was already sent on:
- 28 Nov 2006
fs/nfs/super.c | 1 +
include/linux/nfsd/const.h | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
--- linux-2.6.19-rc6-mm1/include/linux/nfsd/const.h.old 2006-11-28 05:06:16.000000000 +0100
+++ linux-2.6.19-rc6-mm1/include/linux/nfsd/const.h 2006-11-28 05:06:35.000000000 +0100
@@ -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
--- linux-2.6.19-rc6-mm1/fs/nfs/super.c.old 2006-11-28 05:06:51.000000000 +0100
+++ linux-2.6.19-rc6-mm1/fs/nfs/super.c 2006-11-28 05:07:08.000000000 +0100
@@ -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>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [2.6 patch] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC
@ 2006-11-28 4:54 Adrian Bunk
0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2006-11-28 4:54 UTC (permalink / raw)
To: trond.myklebust; +Cc: linux-kernel
NFS_SUPER_MAGIC is already defined in include/linux/magic.h
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/nfs/super.c | 1 +
include/linux/nfsd/const.h | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
--- linux-2.6.19-rc6-mm1/include/linux/nfsd/const.h.old 2006-11-28 05:06:16.000000000 +0100
+++ linux-2.6.19-rc6-mm1/include/linux/nfsd/const.h 2006-11-28 05:06:35.000000000 +0100
@@ -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
--- linux-2.6.19-rc6-mm1/fs/nfs/super.c.old 2006-11-28 05:06:51.000000000 +0100
+++ linux-2.6.19-rc6-mm1/fs/nfs/super.c 2006-11-28 05:07:08.000000000 +0100
@@ -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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-01-11 13:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-11 13:49 [2.6 patch] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2006-11-28 4:54 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).