[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20061128045431.GZ15364@stusta.de>
Date: Tue, 28 Nov 2006 05:54:31 +0100
From: Adrian Bunk <bunk@...sta.de>
To: trond.myklebust@....uio.no
Cc: linux-kernel@...r.kernel.org
Subject: [2.6 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@...sta.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>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists