Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next

[deliverable/linux.git] / fs / nfs / nfs.h

diff --git a/fs/nfs/nfs.h b/fs/nfs/nfs.h
index ac10b9e6c920421d4ecf57f71c4efab6d77f8af6..43679df56cd0536c5ea9186a2c800867d58ed643 100644 (file)
--- a/fs/nfs/nfs.h
+++ b/fs/nfs/nfs.h
@@ -16,54 +16,11 @@ struct nfs_subversion {
        struct file_system_type *nfs_fs;        /* NFS filesystem type */
        const struct rpc_version *rpc_vers;     /* NFS version information */
        const struct nfs_rpc_ops *rpc_ops;      /* NFS operations */
+       const struct super_operations *sops;    /* NFS Super operations */
+       const struct xattr_handler **xattr;     /* NFS xattr handlers */
        struct list_head list;          /* List of NFS versions */
 };
 
-int nfs_register_versions(void);
-void nfs_unregister_versions(void);
-
-#ifdef CONFIG_NFS_V2
-int init_nfs_v2(void);
-void exit_nfs_v2(void);
-#else /* CONFIG_NFS_V2 */
-static inline int __init init_nfs_v2(void)
-{
-       return 0;
-}
-
-static inline void exit_nfs_v2(void)
-{
-}
-#endif /* CONFIG_NFS_V2 */
-
-#ifdef CONFIG_NFS_V3
-int init_nfs_v3(void);
-void exit_nfs_v3(void);
-#else /* CONFIG_NFS_V3 */
-static inline int __init init_nfs_v3(void)
-{
-       return 0;
-}
-
-static inline void exit_nfs_v3(void)
-{
-}
-#endif /* CONFIG_NFS_V3 */
-
-#ifdef CONFIG_NFS_V4
-int init_nfs_v4(void);
-void exit_nfs_v4(void);
-#else /* CONFIG_NFS_V4 */
-static inline int __init init_nfs_v4(void)
-{
-       return 0;
-}
-
-static inline void exit_nfs_v4(void)
-{
-}
-#endif /* CONFIG_NFS_V4 */
-
 struct nfs_subversion *get_nfs_version(unsigned int);
 void put_nfs_version(struct nfs_subversion *);
 void register_nfs_version(struct nfs_subversion *);