diff options
-rw-r--r-- | fs/cifs/cifsfs.c | 4 | ||||
-rw-r--r-- | fs/cifs/cifsfs.h | 4 | ||||
-rw-r--r-- | fs/cifs/export.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 7986d330cbb5..aa8fe7cee0b4 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -132,12 +132,12 @@ cifs_read_super(struct super_block *sb) | |||
132 | else | 132 | else |
133 | sb->s_d_op = &cifs_dentry_ops; | 133 | sb->s_d_op = &cifs_dentry_ops; |
134 | 134 | ||
135 | #ifdef CIFS_NFSD_EXPORT | 135 | #ifdef CONFIG_CIFS_NFSD_EXPORT |
136 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { | 136 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM) { |
137 | cFYI(1, "export ops supported"); | 137 | cFYI(1, "export ops supported"); |
138 | sb->s_export_op = &cifs_export_ops; | 138 | sb->s_export_op = &cifs_export_ops; |
139 | } | 139 | } |
140 | #endif /* CIFS_NFSD_EXPORT */ | 140 | #endif /* CONFIG_CIFS_NFSD_EXPORT */ |
141 | 141 | ||
142 | return 0; | 142 | return 0; |
143 | 143 | ||
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 95da8027983d..d9dbaf869cd1 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
@@ -121,9 +121,9 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); | |||
121 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); | 121 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); |
122 | extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); | 122 | extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); |
123 | 123 | ||
124 | #ifdef CIFS_NFSD_EXPORT | 124 | #ifdef CONFIG_CIFS_NFSD_EXPORT |
125 | extern const struct export_operations cifs_export_ops; | 125 | extern const struct export_operations cifs_export_ops; |
126 | #endif /* CIFS_NFSD_EXPORT */ | 126 | #endif /* CONFIG_CIFS_NFSD_EXPORT */ |
127 | 127 | ||
128 | #define CIFS_VERSION "1.75" | 128 | #define CIFS_VERSION "1.75" |
129 | #endif /* _CIFSFS_H */ | 129 | #endif /* _CIFSFS_H */ |
diff --git a/fs/cifs/export.c b/fs/cifs/export.c index 55d87ac52000..9c7ecdccf2f3 100644 --- a/fs/cifs/export.c +++ b/fs/cifs/export.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include "cifs_debug.h" | 45 | #include "cifs_debug.h" |
46 | #include "cifsfs.h" | 46 | #include "cifsfs.h" |
47 | 47 | ||
48 | #ifdef CIFS_NFSD_EXPORT | 48 | #ifdef CONFIG_CIFS_NFSD_EXPORT |
49 | static struct dentry *cifs_get_parent(struct dentry *dentry) | 49 | static struct dentry *cifs_get_parent(struct dentry *dentry) |
50 | { | 50 | { |
51 | /* BB need to add code here eventually to enable export via NFSD */ | 51 | /* BB need to add code here eventually to enable export via NFSD */ |
@@ -63,5 +63,5 @@ const struct export_operations cifs_export_ops = { | |||
63 | .encode_fs = */ | 63 | .encode_fs = */ |
64 | }; | 64 | }; |
65 | 65 | ||
66 | #endif /* CIFS_NFSD_EXPORT */ | 66 | #endif /* CONFIG_CIFS_NFSD_EXPORT */ |
67 | 67 | ||