diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 15:09:06 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 15:09:06 -0500 |
| commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
| tree | a72913a29495ca078987c09fc0008f47e11b900b /fs/cifs/cifssmb.c | |
| parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
| parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'fs/cifs/cifssmb.c')
| -rw-r--r-- | fs/cifs/cifssmb.c | 2 |
1 files changed, 0 insertions, 2 deletions
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, |