diff options
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifsproto.h | 2 | ||||
-rw-r--r-- | fs/cifs/cifssmb.c | 2 | ||||
-rw-r--r-- | fs/cifs/inode.c | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index d301149b1bb0..1b73f4f4c5ce 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
@@ -242,11 +242,11 @@ extern int CIFSSMBWrite2(const int xid, struct cifsTconInfo *tcon, | |||
242 | const int netfid, const unsigned int count, | 242 | const int netfid, const unsigned int count, |
243 | const __u64 offset, unsigned int *nbytes, | 243 | const __u64 offset, unsigned int *nbytes, |
244 | struct kvec *iov, const int nvec, const int long_op); | 244 | struct kvec *iov, const int nvec, const int long_op); |
245 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ | ||
245 | extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, | 246 | extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, |
246 | const unsigned char *searchName, __u64 * inode_number, | 247 | const unsigned char *searchName, __u64 * inode_number, |
247 | const struct nls_table *nls_codepage, | 248 | const struct nls_table *nls_codepage, |
248 | int remap_special_chars); | 249 | int remap_special_chars); |
249 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ | ||
250 | extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen, | 250 | extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen, |
251 | const struct nls_table * codepage); | 251 | const struct nls_table * codepage); |
252 | extern int cifsConvertToUCS(__le16 * target, const char *source, int maxlen, | 252 | extern int cifsConvertToUCS(__le16 * target, const char *source, int maxlen, |
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 9312bfc56682..a53c596e1082 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c | |||
@@ -2959,7 +2959,6 @@ CIFSFindClose(const int xid, struct cifsTconInfo *tcon, const __u16 searchHandle | |||
2959 | return rc; | 2959 | return rc; |
2960 | } | 2960 | } |
2961 | 2961 | ||
2962 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
2963 | int | 2962 | int |
2964 | CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, | 2963 | CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, |
2965 | const unsigned char *searchName, | 2964 | const unsigned char *searchName, |
@@ -3053,7 +3052,6 @@ GetInodeNumOut: | |||
3053 | goto GetInodeNumberRetry; | 3052 | goto GetInodeNumberRetry; |
3054 | return rc; | 3053 | return rc; |
3055 | } | 3054 | } |
3056 | #endif /* CIFS_EXPERIMENTAL */ | ||
3057 | 3055 | ||
3058 | int | 3056 | int |
3059 | CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, | 3057 | CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses, |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 912d401600f6..923d071163b2 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -283,7 +283,6 @@ int cifs_get_inode_info(struct inode **pinode, | |||
283 | there Windows server or network appliances for which | 283 | there Windows server or network appliances for which |
284 | IndexNumber field is not guaranteed unique? */ | 284 | IndexNumber field is not guaranteed unique? */ |
285 | 285 | ||
286 | #ifdef CONFIG_CIFS_EXPERIMENTAL | ||
287 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM){ | 286 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM){ |
288 | int rc1 = 0; | 287 | int rc1 = 0; |
289 | __u64 inode_num; | 288 | __u64 inode_num; |
@@ -299,7 +298,6 @@ int cifs_get_inode_info(struct inode **pinode, | |||
299 | } else /* do we need cast or hash to ino? */ | 298 | } else /* do we need cast or hash to ino? */ |
300 | (*pinode)->i_ino = inode_num; | 299 | (*pinode)->i_ino = inode_num; |
301 | } /* else ino incremented to unique num in new_inode*/ | 300 | } /* else ino incremented to unique num in new_inode*/ |
302 | #endif /* CIFS_EXPERIMENTAL */ | ||
303 | insert_inode_hash(*pinode); | 301 | insert_inode_hash(*pinode); |
304 | } | 302 | } |
305 | inode = *pinode; | 303 | inode = *pinode; |