diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-06-22 13:16:21 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-06-22 16:07:06 -0400 |
commit | 4ce79717ce32a9f88c1ddce4b9658556cb59d37a (patch) | |
tree | 7f0c5e4bdbc2ee15b8e902b951d1be200b35411f /fs/nfs/nfs4proc.c | |
parent | 9085bbcb76421a90bea28f4d3d03fa9977319c49 (diff) |
[PATCH] NFS: Header file cleanup...
- Move NFSv4 state definitions into a private header file.
- Clean up gunk in nfs_fs.h
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1d5cb3e80c3e..a69c02b206c1 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <linux/smp_lock.h> | 48 | #include <linux/smp_lock.h> |
49 | #include <linux/namei.h> | 49 | #include <linux/namei.h> |
50 | 50 | ||
51 | #include "nfs4_fs.h" | ||
51 | #include "delegation.h" | 52 | #include "delegation.h" |
52 | 53 | ||
53 | #define NFSDBG_FACILITY NFSDBG_PROC | 54 | #define NFSDBG_FACILITY NFSDBG_PROC |
@@ -62,8 +63,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc | |||
62 | extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus); | 63 | extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus); |
63 | extern struct rpc_procinfo nfs4_procedures[]; | 64 | extern struct rpc_procinfo nfs4_procedures[]; |
64 | 65 | ||
65 | extern nfs4_stateid zero_stateid; | ||
66 | |||
67 | /* Prevent leaks of NFSv4 errors into userland */ | 66 | /* Prevent leaks of NFSv4 errors into userland */ |
68 | int nfs4_map_errors(int err) | 67 | int nfs4_map_errors(int err) |
69 | { | 68 | { |
@@ -104,7 +103,7 @@ const u32 nfs4_statfs_bitmap[2] = { | |||
104 | | FATTR4_WORD1_SPACE_TOTAL | 103 | | FATTR4_WORD1_SPACE_TOTAL |
105 | }; | 104 | }; |
106 | 105 | ||
107 | u32 nfs4_pathconf_bitmap[2] = { | 106 | const u32 nfs4_pathconf_bitmap[2] = { |
108 | FATTR4_WORD0_MAXLINK | 107 | FATTR4_WORD0_MAXLINK |
109 | | FATTR4_WORD0_MAXNAME, | 108 | | FATTR4_WORD0_MAXNAME, |
110 | 0 | 109 | 0 |