NFSv41: Convert the various reboot recovery ops etc to minor version ops
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
97dc135947
commit
c48f4f3541
4 changed files with 18 additions and 38 deletions
|
@ -60,6 +60,9 @@ struct nfs4_minor_version_ops {
|
||||||
struct nfs4_sequence_args *args,
|
struct nfs4_sequence_args *args,
|
||||||
struct nfs4_sequence_res *res,
|
struct nfs4_sequence_res *res,
|
||||||
int cache_reply);
|
int cache_reply);
|
||||||
|
const struct nfs4_state_recovery_ops *reboot_recovery_ops;
|
||||||
|
const struct nfs4_state_recovery_ops *nograce_recovery_ops;
|
||||||
|
const struct nfs4_state_maintenance_ops *state_renewal_ops;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -233,8 +236,6 @@ extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fh
|
||||||
extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
|
extern int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name,
|
||||||
struct nfs4_fs_locations *fs_locations, struct page *page);
|
struct nfs4_fs_locations *fs_locations, struct page *page);
|
||||||
|
|
||||||
extern struct nfs4_state_recovery_ops *nfs4_reboot_recovery_ops[];
|
|
||||||
extern struct nfs4_state_recovery_ops *nfs4_nograce_recovery_ops[];
|
|
||||||
#if defined(CONFIG_NFS_V4_1)
|
#if defined(CONFIG_NFS_V4_1)
|
||||||
static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)
|
static inline struct nfs4_session *nfs4_get_session(const struct nfs_server *server)
|
||||||
{
|
{
|
||||||
|
@ -271,7 +272,6 @@ static inline int nfs4_init_session(struct nfs_server *server)
|
||||||
#endif /* CONFIG_NFS_V4_1 */
|
#endif /* CONFIG_NFS_V4_1 */
|
||||||
|
|
||||||
extern const struct nfs4_minor_version_ops *nfs_v4_minor_ops[];
|
extern const struct nfs4_minor_version_ops *nfs_v4_minor_ops[];
|
||||||
extern struct nfs4_state_maintenance_ops *nfs4_state_renewal_ops[];
|
|
||||||
|
|
||||||
extern const u32 nfs4_fattr_bitmap[2];
|
extern const u32 nfs4_fattr_bitmap[2];
|
||||||
extern const u32 nfs4_statfs_bitmap[2];
|
extern const u32 nfs4_statfs_bitmap[2];
|
||||||
|
|
|
@ -5356,40 +5356,21 @@ struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = {
|
||||||
static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = {
|
static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = {
|
||||||
.minor_version = 0,
|
.minor_version = 0,
|
||||||
.call_sync = _nfs4_call_sync,
|
.call_sync = _nfs4_call_sync,
|
||||||
|
.reboot_recovery_ops = &nfs40_reboot_recovery_ops,
|
||||||
|
.nograce_recovery_ops = &nfs40_nograce_recovery_ops,
|
||||||
|
.state_renewal_ops = &nfs40_state_renewal_ops,
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CONFIG_NFS_V4_1)
|
#if defined(CONFIG_NFS_V4_1)
|
||||||
static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = {
|
static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = {
|
||||||
.minor_version = 1,
|
.minor_version = 1,
|
||||||
.call_sync = _nfs4_call_sync_session,
|
.call_sync = _nfs4_call_sync_session,
|
||||||
|
.reboot_recovery_ops = &nfs41_reboot_recovery_ops,
|
||||||
|
.nograce_recovery_ops = &nfs41_nograce_recovery_ops,
|
||||||
|
.state_renewal_ops = &nfs41_state_renewal_ops,
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* Per minor version reboot and network partition recovery ops
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct nfs4_state_recovery_ops *nfs4_reboot_recovery_ops[] = {
|
|
||||||
&nfs40_reboot_recovery_ops,
|
|
||||||
#if defined(CONFIG_NFS_V4_1)
|
|
||||||
&nfs41_reboot_recovery_ops,
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
struct nfs4_state_recovery_ops *nfs4_nograce_recovery_ops[] = {
|
|
||||||
&nfs40_nograce_recovery_ops,
|
|
||||||
#if defined(CONFIG_NFS_V4_1)
|
|
||||||
&nfs41_nograce_recovery_ops,
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
struct nfs4_state_maintenance_ops *nfs4_state_renewal_ops[] = {
|
|
||||||
&nfs40_state_renewal_ops,
|
|
||||||
#if defined(CONFIG_NFS_V4_1)
|
|
||||||
&nfs41_state_renewal_ops,
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
|
const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = {
|
||||||
[0] = &nfs_v4_0_minor_ops,
|
[0] = &nfs_v4_0_minor_ops,
|
||||||
#if defined(CONFIG_NFS_V4_1)
|
#if defined(CONFIG_NFS_V4_1)
|
||||||
|
|
|
@ -54,14 +54,14 @@
|
||||||
void
|
void
|
||||||
nfs4_renew_state(struct work_struct *work)
|
nfs4_renew_state(struct work_struct *work)
|
||||||
{
|
{
|
||||||
struct nfs4_state_maintenance_ops *ops;
|
const struct nfs4_state_maintenance_ops *ops;
|
||||||
struct nfs_client *clp =
|
struct nfs_client *clp =
|
||||||
container_of(work, struct nfs_client, cl_renewd.work);
|
container_of(work, struct nfs_client, cl_renewd.work);
|
||||||
struct rpc_cred *cred;
|
struct rpc_cred *cred;
|
||||||
long lease;
|
long lease;
|
||||||
unsigned long last, now;
|
unsigned long last, now;
|
||||||
|
|
||||||
ops = nfs4_state_renewal_ops[clp->cl_minorversion];
|
ops = clp->cl_mvops->state_renewal_ops;
|
||||||
dprintk("%s: start\n", __func__);
|
dprintk("%s: start\n", __func__);
|
||||||
/* Are there any active superblocks? */
|
/* Are there any active superblocks? */
|
||||||
if (list_empty(&clp->cl_superblocks))
|
if (list_empty(&clp->cl_superblocks))
|
||||||
|
|
|
@ -1122,8 +1122,7 @@ static void nfs4_state_end_reclaim_reboot(struct nfs_client *clp)
|
||||||
if (!test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
|
if (!test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
nfs4_reclaim_complete(clp,
|
nfs4_reclaim_complete(clp, clp->cl_mvops->reboot_recovery_ops);
|
||||||
nfs4_reboot_recovery_ops[clp->cl_minorversion]);
|
|
||||||
|
|
||||||
for (pos = rb_first(&clp->cl_state_owners); pos != NULL; pos = rb_next(pos)) {
|
for (pos = rb_first(&clp->cl_state_owners); pos != NULL; pos = rb_next(pos)) {
|
||||||
sp = rb_entry(pos, struct nfs4_state_owner, so_client_node);
|
sp = rb_entry(pos, struct nfs4_state_owner, so_client_node);
|
||||||
|
@ -1213,8 +1212,8 @@ restart:
|
||||||
static int nfs4_check_lease(struct nfs_client *clp)
|
static int nfs4_check_lease(struct nfs_client *clp)
|
||||||
{
|
{
|
||||||
struct rpc_cred *cred;
|
struct rpc_cred *cred;
|
||||||
struct nfs4_state_maintenance_ops *ops =
|
const struct nfs4_state_maintenance_ops *ops =
|
||||||
nfs4_state_renewal_ops[clp->cl_minorversion];
|
clp->cl_mvops->state_renewal_ops;
|
||||||
int status = -NFS4ERR_EXPIRED;
|
int status = -NFS4ERR_EXPIRED;
|
||||||
|
|
||||||
/* Is the client already known to have an expired lease? */
|
/* Is the client already known to have an expired lease? */
|
||||||
|
@ -1237,8 +1236,8 @@ out:
|
||||||
static int nfs4_reclaim_lease(struct nfs_client *clp)
|
static int nfs4_reclaim_lease(struct nfs_client *clp)
|
||||||
{
|
{
|
||||||
struct rpc_cred *cred;
|
struct rpc_cred *cred;
|
||||||
struct nfs4_state_recovery_ops *ops =
|
const struct nfs4_state_recovery_ops *ops =
|
||||||
nfs4_reboot_recovery_ops[clp->cl_minorversion];
|
clp->cl_mvops->reboot_recovery_ops;
|
||||||
int status = -ENOENT;
|
int status = -ENOENT;
|
||||||
|
|
||||||
cred = ops->get_clid_cred(clp);
|
cred = ops->get_clid_cred(clp);
|
||||||
|
@ -1446,7 +1445,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
|
||||||
/* First recover reboot state... */
|
/* First recover reboot state... */
|
||||||
if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {
|
if (test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {
|
||||||
status = nfs4_do_reclaim(clp,
|
status = nfs4_do_reclaim(clp,
|
||||||
nfs4_reboot_recovery_ops[clp->cl_minorversion]);
|
clp->cl_mvops->reboot_recovery_ops);
|
||||||
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
||||||
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))
|
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))
|
||||||
continue;
|
continue;
|
||||||
|
@ -1460,7 +1459,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
|
||||||
/* Now recover expired state... */
|
/* Now recover expired state... */
|
||||||
if (test_and_clear_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state)) {
|
if (test_and_clear_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state)) {
|
||||||
status = nfs4_do_reclaim(clp,
|
status = nfs4_do_reclaim(clp,
|
||||||
nfs4_nograce_recovery_ops[clp->cl_minorversion]);
|
clp->cl_mvops->nograce_recovery_ops);
|
||||||
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
||||||
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) ||
|
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) ||
|
||||||
test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
|
test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
|
||||||
|
|
Loading…
Reference in a new issue