diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:29:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 18:29:58 -0400 |
| commit | d0b6e0e380d6a32d479120a8b5d98cdff936ec8c (patch) | |
| tree | 57b584f4ba8504eb39e9f12234fc78db7fff0477 /fs/nfs/getroot.c | |
| parent | 5329571b3c978635f6d832cc884fdd61ff94e0da (diff) | |
| parent | 7a13e932281e7042a592f4f14db0b348199e7aac (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6:
NFS: Kill the obsolete NFS_PARANOIA
NFS: use __set_current_state()
sunrpc: fix crash in rpc_malloc()
NFS: Clean up NFSv4 XDR error message
NFS: NFS client underestimates how large an NFSv4 SETATTR reply can be
SUNRPC: Fix pointer arithmetic bug recently introduced in rpc_malloc/free
NFS: Remove redundant check in nfs_check_verifier()
NFS: Fix a jiffie wraparound issue
Diffstat (limited to 'fs/nfs/getroot.c')
| -rw-r--r-- | fs/nfs/getroot.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index 234778576f09..d1cbf0a0fbb2 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include "internal.h" | 41 | #include "internal.h" |
| 42 | 42 | ||
| 43 | #define NFSDBG_FACILITY NFSDBG_CLIENT | 43 | #define NFSDBG_FACILITY NFSDBG_CLIENT |
| 44 | #define NFS_PARANOIA 1 | ||
| 45 | 44 | ||
| 46 | /* | 45 | /* |
| 47 | * get an NFS2/NFS3 root dentry from the root filehandle | 46 | * get an NFS2/NFS3 root dentry from the root filehandle |