diff options
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r-- | fs/nfs/internal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 660e9ff5341c..4802157963f8 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
@@ -15,7 +15,7 @@ struct nfs_clone_mount { | |||
15 | rpc_authflavor_t authflavor; | 15 | rpc_authflavor_t authflavor; |
16 | }; | 16 | }; |
17 | 17 | ||
18 | /* namespace-nfs4.c */ | 18 | /* nfs4namespace.c */ |
19 | #ifdef CONFIG_NFS_V4 | 19 | #ifdef CONFIG_NFS_V4 |
20 | extern struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry); | 20 | extern struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentry *dentry); |
21 | #else | 21 | #else |
@@ -46,6 +46,7 @@ extern void nfs_destroy_directcache(void); | |||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | /* nfs2xdr.c */ | 48 | /* nfs2xdr.c */ |
49 | extern int nfs_stat_to_errno(int); | ||
49 | extern struct rpc_procinfo nfs_procedures[]; | 50 | extern struct rpc_procinfo nfs_procedures[]; |
50 | extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int); | 51 | extern u32 * nfs_decode_dirent(u32 *, struct nfs_entry *, int); |
51 | 52 | ||
@@ -54,8 +55,9 @@ extern struct rpc_procinfo nfs3_procedures[]; | |||
54 | extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int); | 55 | extern u32 *nfs3_decode_dirent(u32 *, struct nfs_entry *, int); |
55 | 56 | ||
56 | /* nfs4xdr.c */ | 57 | /* nfs4xdr.c */ |
57 | extern int nfs_stat_to_errno(int); | 58 | #ifdef CONFIG_NFS_V4 |
58 | extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus); | 59 | extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus); |
60 | #endif | ||
59 | 61 | ||
60 | /* nfs4proc.c */ | 62 | /* nfs4proc.c */ |
61 | #ifdef CONFIG_NFS_V4 | 63 | #ifdef CONFIG_NFS_V4 |
@@ -97,15 +99,13 @@ extern char *nfs_path(const char *base, const struct dentry *dentry, | |||
97 | /* | 99 | /* |
98 | * Determine the mount path as a string | 100 | * Determine the mount path as a string |
99 | */ | 101 | */ |
102 | #ifdef CONFIG_NFS_V4 | ||
100 | static inline char * | 103 | static inline char * |
101 | nfs4_path(const struct dentry *dentry, char *buffer, ssize_t buflen) | 104 | nfs4_path(const struct dentry *dentry, char *buffer, ssize_t buflen) |
102 | { | 105 | { |
103 | #ifdef CONFIG_NFS_V4 | ||
104 | return nfs_path(NFS_SB(dentry->d_sb)->mnt_path, dentry, buffer, buflen); | 106 | return nfs_path(NFS_SB(dentry->d_sb)->mnt_path, dentry, buffer, buflen); |
105 | #else | ||
106 | return NULL; | ||
107 | #endif | ||
108 | } | 107 | } |
108 | #endif | ||
109 | 109 | ||
110 | /* | 110 | /* |
111 | * Determine the device name as a string | 111 | * Determine the device name as a string |