Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / fs / xfs / linux-2.6 / xfs_super.h

diff --git a/fs/xfs/linux-2.6/xfs_super.h b/fs/xfs/linux-2.6/xfs_super.h
index 33dd1ca13245544b154e67bc2324b72ff5393571..3efb7c6d330352201bdb897d200b1f1e76ac295b 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_super.h
+++ b/fs/xfs/linux-2.6/xfs_super.h
@@ -18,6 +18,8 @@
 #ifndef __XFS_SUPER_H__
 #define __XFS_SUPER_H__
 
+#include <linux/exportfs.h>
+
 #ifdef CONFIG_XFS_DMAPI
 # define vfs_insertdmapi(vfs)  vfs_insertops(vfsp, &xfs_dmops)
 # define vfs_initdmapi()       dmapi_init()
@@ -48,13 +50,7 @@ extern void xfs_qm_exit(void);
 # define set_posix_acl_flag(sb)        do { } while (0)
 #endif
 
-#ifdef CONFIG_XFS_SECURITY
-# define XFS_SECURITY_STRING   "security attributes, "
-# define ENOSECURITY           0
-#else
-# define XFS_SECURITY_STRING
-# define ENOSECURITY           EOPNOTSUPP
-#endif
+#define XFS_SECURITY_STRING    "security attributes, "
 
 #ifdef CONFIG_XFS_RT
 # define XFS_REALTIME_STRING   "realtime, "
@@ -105,7 +101,8 @@ struct block_device;
 
 extern __uint64_t xfs_max_file_offset(unsigned int);
 
-extern void xfs_initialize_vnode(bhv_desc_t *, bhv_vnode_t *, bhv_desc_t *, int);
+extern void xfs_initialize_vnode(struct xfs_mount *mp, bhv_vnode_t *vp,
+               struct xfs_inode *ip);
 
 extern void xfs_flush_inode(struct xfs_inode *);
 extern void xfs_flush_device(struct xfs_inode *);
@@ -115,6 +112,8 @@ extern int  xfs_blkdev_get(struct xfs_mount *, const char *,
 extern void xfs_blkdev_put(struct block_device *);
 extern void xfs_blkdev_issue_flush(struct xfs_buftarg *);
 
-extern struct export_operations xfs_export_operations;
+extern const struct export_operations xfs_export_operations;
+
+#define XFS_M(sb)              ((struct xfs_mount *)((sb)->s_fs_info))
 
 #endif /* __XFS_SUPER_H__ */