Skip to content

Commit

Permalink
[PATCH] include/linux/nfsd/const.h: remove NFS_SUPER_MAGIC
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Feb 12, 2007
1 parent 77f1f67 commit b5d5dfb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions include/linux/nfsd/const.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b5d5dfb

Please sign in to comment.