aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4_fs.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-06-16 09:52:27 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-06-22 13:24:02 -0400
commitc48f4f3541e67881c9eb7c46e052f5ece48ef530 (patch)
tree99e99c9ebff6dcf9da430b9e1654582138a2b1de /fs/nfs/nfs4_fs.h
parent97dc135947181a6670949a480da56c3ebf8d3715 (diff)
NFSv41: Convert the various reboot recovery ops etc to minor version ops
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
-rw-r--r--fs/nfs/nfs4_fs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 5b01705e30f9..1ff0ea2a8461 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -60,6 +60,9 @@ struct nfs4_minor_version_ops {
60 struct nfs4_sequence_args *args, 60 struct nfs4_sequence_args *args,
61 struct nfs4_sequence_res *res, 61 struct nfs4_sequence_res *res,
62 int cache_reply); 62 int cache_reply);
63 const struct nfs4_state_recovery_ops *reboot_recovery_ops;
64 const struct nfs4_state_recovery_ops *nograce_recovery_ops;
65 const struct nfs4_state_maintenance_ops *state_renewal_ops;
63}; 66};
64 67
65/* 68/*
@@ -233,8 +236,6 @@ extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fh
233extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name, 236extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
234 struct nfs4_fs_locations *fs_locations, struct page *page); 237 struct nfs4_fs_locations *fs_locations, struct page *page);
235 238
236extern struct nfs4_state_recovery_ops *nfs4_reboot_recovery_ops[];
237extern struct nfs4_state_recovery_ops *nfs4_nograce_recovery_ops[];
238#if defined(CONFIG_NFS_V4_1) 239#if defined(CONFIG_NFS_V4_1)
239static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server) 240static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)
240{ 241{
@@ -271,7 +272,6 @@ static inline int nfs4_init_session(struct nfs_server *server)
271#endif /* CONFIG_NFS_V4_1 */ 272#endif /* CONFIG_NFS_V4_1 */
272 273
273extern const struct nfs4_minor_version_ops *nfs_v4_minor_ops[]; 274extern const struct nfs4_minor_version_ops *nfs_v4_minor_ops[];
274extern struct nfs4_state_maintenance_ops *nfs4_state_renewal_ops[];
275 275
276extern const u32 nfs4_fattr_bitmap[2]; 276extern const u32 nfs4_fattr_bitmap[2];
277extern const u32 nfs4_statfs_bitmap[2]; 277extern const u32 nfs4_statfs_bitmap[2];