Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / fs / cifs / export.c

diff --git a/fs/cifs/export.c b/fs/cifs/export.c
index 6e66bc19f0aee71de61754aa3d1338aaebc31650..75949d6a5f1b33484635f6019d08a6f66402cefd 100644 (file)
--- a/fs/cifs/export.c
+++ b/fs/cifs/export.c
@@ -22,7 +22,7 @@
  *   along with this library; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
- 
+
  /*
   * See Documentation/filesystems/Exporting
   * and examples in fs/exportfs
@@ -40,20 +40,20 @@
   */
 
 #include <linux/fs.h>
+#include <linux/exportfs.h>
 #include "cifsglob.h"
 #include "cifs_debug.h"
+#include "cifsfs.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 */
        cFYI(1, ("get parent for %p", dentry));
        return ERR_PTR(-EACCES);
 }
- 
-struct export_operations cifs_export_ops = {
+
+const struct export_operations cifs_export_ops = {
        .get_parent = cifs_get_parent,
 /*     Following five export operations are unneeded so far and can default:
        .get_dentry =
@@ -62,6 +62,6 @@ struct export_operations cifs_export_ops = {
        .decode_fh =
        .encode_fs =  */
 };
- 
+
 #endif /* EXPERIMENTAL */
- 
+