Skip to content

Commit

Permalink
cifs: Fix typo 'CIFS_NFSD_EXPORT'
Browse files Browse the repository at this point in the history
It should be 'CONFIG_CIFS_NFSD_EXPORT'. No-one noticed because that
symbol depends on BROKEN.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Steve French <smfrench@gmail.com>
  • Loading branch information
Paul Bolle authored and Steve French committed Oct 13, 2011
1 parent 4a29a0b commit f3a6a60
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions fs/cifs/cifsfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ cifs_read_super(struct super_block *sb)
else
sb->s_d_op = &cifs_dentry_ops;

#ifdef CIFS_NFSD_EXPORT
#ifdef CONFIG_CIFS_NFSD_EXPORT
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) {
cFYI(1, "export ops supported");
sb->s_export_op = &cifs_export_ops;
}
#endif /* CIFS_NFSD_EXPORT */
#endif /* CONFIG_CIFS_NFSD_EXPORT */

return 0;

Expand Down
4 changes: 2 additions & 2 deletions fs/cifs/cifsfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);

#ifdef CIFS_NFSD_EXPORT
#ifdef CONFIG_CIFS_NFSD_EXPORT
extern const struct export_operations cifs_export_ops;
#endif /* CIFS_NFSD_EXPORT */
#endif /* CONFIG_CIFS_NFSD_EXPORT */

#define CIFS_VERSION "1.75"
#endif /* _CIFSFS_H */
4 changes: 2 additions & 2 deletions fs/cifs/export.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "cifs_debug.h"
#include "cifsfs.h"

#ifdef CIFS_NFSD_EXPORT
#ifdef CONFIG_CIFS_NFSD_EXPORT
static struct dentry *cifs_get_parent(struct dentry *dentry)
{
/* BB need to add code here eventually to enable export via NFSD */
Expand All @@ -63,5 +63,5 @@ const struct export_operations cifs_export_ops = {
.encode_fs = */
};

#endif /* CIFS_NFSD_EXPORT */
#endif /* CONFIG_CIFS_NFSD_EXPORT */

0 comments on commit f3a6a60

Please sign in to comment.