diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /fs/cifs/export.c | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
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.c | 2 |
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 @@ | |||
| 44 | #include "cifsglob.h" | 44 | #include "cifsglob.h" |
| 45 | #include "cifs_debug.h" | 45 | #include "cifs_debug.h" |
| 46 | 46 | ||
| 47 | |||
| 48 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 47 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
| 49 | |||
| 50 | static struct dentry *cifs_get_parent(struct dentry *dentry) | 48 | static struct dentry *cifs_get_parent(struct dentry *dentry) |
| 51 | { | 49 | { |
| 52 | /* BB need to add code here eventually to enable export via NFSD */ | 50 | /* BB need to add code here eventually to enable export via NFSD */ |