public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: trond.myklebust@fys.uio.no, linux-kernel@vger.kernel.org
Subject: [2.6 patch] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC
Date: Thu, 11 Jan 2007 14:49:32 +0100	[thread overview]
Message-ID: <20070111134932.GG20027@stusta.de> (raw)

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>


             reply	other threads:[~2007-01-11 13:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-11 13:49 Adrian Bunk [this message]
  -- strict thread matches above, loose matches on Subject: below --
2006-11-28  4:54 [2.6 patch] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC Adrian Bunk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070111134932.GG20027@stusta.de \
    --to=bunk@stusta.de \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=trond.myklebust@fys.uio.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox