aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-10 21:37:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-10 21:37:50 -0800
commit5e04e7fe774794b837e1d3897e6b96ae2d06679a (patch)
treec793e7d26f2d0e5448908b5c95756831d612c9fd /fs/cifs/cifssmb.c
parenta5cf8b7dc5ae69c65ef366325dfc1abb507276c7 (diff)
parent1b397f4f1c167dbf06397b3182fca521c00125c4 (diff)
downloadkernel_samsung_tuna-5e04e7fe774794b837e1d3897e6b96ae2d06679a.zip
kernel_samsung_tuna-5e04e7fe774794b837e1d3897e6b96ae2d06679a.tar.gz
kernel_samsung_tuna-5e04e7fe774794b837e1d3897e6b96ae2d06679a.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 9312bfc..a53c596 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
return rc;
}
-#ifdef CONFIG_CIFS_EXPERIMENTAL
int
CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon,
const unsigned char *searchName,
@@ -3053,7 +3052,6 @@ GetInodeNumOut:
goto GetInodeNumberRetry;
return rc;
}
-#endif /* CIFS_EXPERIMENTAL */
int
CIFSGetDFSRefer(const int xid, struct cifsSesInfo *ses,