summaryrefslogtreecommitdiff
path: root/fs/cifs/export.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-07-19 04:38:57 +0400
committerSteve French <sfrench@us.ibm.com>2007-07-19 04:38:57 +0400
commit1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch)
tree860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/cifs/export.c
parent70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff)
parent5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff)
downloadlinux-1ff8392c32a2645d2665ca779ecb91bb29361c13.tar.xz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: fs/cifs/export.c
Diffstat (limited to 'fs/cifs/export.c')
-rw-r--r--fs/cifs/export.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index c21d3d09d0af..893fd0aebff8 100644
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -44,9 +44,7 @@
#include "cifsglob.h"
#include "cifs_debug.h"
-
#ifdef CONFIG_CIFS_EXPERIMENTAL
-
static struct dentry *cifs_get_parent(struct dentry *dentry)
{
/* BB need to add code here eventually to enable export via NFSD */