nfsd: add an operation for unhashing a stateowner
Allow stateowners to be unhashed and destroyed when the last reference is put. The unhashing must be idempotent. In a future patch, we'll add some locking around it, but for now it's only protected by the client_mutex. Signed-off-by: Jeff Layton <jlayton@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
5db1c03feb
commit
8f4b54c53f
|
@ -894,6 +894,7 @@ static void nfs4_put_stateowner(struct nfs4_stateowner *sop)
|
||||||
{
|
{
|
||||||
if (!atomic_dec_and_test(&sop->so_count))
|
if (!atomic_dec_and_test(&sop->so_count))
|
||||||
return;
|
return;
|
||||||
|
sop->so_ops->so_unhash(sop);
|
||||||
kfree(sop->so_owner.data);
|
kfree(sop->so_owner.data);
|
||||||
sop->so_ops->so_free(sop);
|
sop->so_ops->so_free(sop);
|
||||||
}
|
}
|
||||||
|
@ -943,10 +944,14 @@ static void __release_lock_stateid(struct nfs4_ol_stateid *stp)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void unhash_lockowner(struct nfs4_lockowner *lo)
|
static void unhash_lockowner(struct nfs4_lockowner *lo)
|
||||||
|
{
|
||||||
|
list_del_init(&lo->lo_owner.so_strhash);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void release_lockowner_stateids(struct nfs4_lockowner *lo)
|
||||||
{
|
{
|
||||||
struct nfs4_ol_stateid *stp;
|
struct nfs4_ol_stateid *stp;
|
||||||
|
|
||||||
list_del(&lo->lo_owner.so_strhash);
|
|
||||||
while (!list_empty(&lo->lo_owner.so_stateids)) {
|
while (!list_empty(&lo->lo_owner.so_stateids)) {
|
||||||
stp = list_first_entry(&lo->lo_owner.so_stateids,
|
stp = list_first_entry(&lo->lo_owner.so_stateids,
|
||||||
struct nfs4_ol_stateid, st_perstateowner);
|
struct nfs4_ol_stateid, st_perstateowner);
|
||||||
|
@ -957,6 +962,7 @@ static void unhash_lockowner(struct nfs4_lockowner *lo)
|
||||||
static void release_lockowner(struct nfs4_lockowner *lo)
|
static void release_lockowner(struct nfs4_lockowner *lo)
|
||||||
{
|
{
|
||||||
unhash_lockowner(lo);
|
unhash_lockowner(lo);
|
||||||
|
release_lockowner_stateids(lo);
|
||||||
nfs4_put_stateowner(&lo->lo_owner);
|
nfs4_put_stateowner(&lo->lo_owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1006,15 +1012,8 @@ static void release_open_stateid(struct nfs4_ol_stateid *stp)
|
||||||
|
|
||||||
static void unhash_openowner(struct nfs4_openowner *oo)
|
static void unhash_openowner(struct nfs4_openowner *oo)
|
||||||
{
|
{
|
||||||
struct nfs4_ol_stateid *stp;
|
list_del_init(&oo->oo_owner.so_strhash);
|
||||||
|
list_del_init(&oo->oo_perclient);
|
||||||
list_del(&oo->oo_owner.so_strhash);
|
|
||||||
list_del(&oo->oo_perclient);
|
|
||||||
while (!list_empty(&oo->oo_owner.so_stateids)) {
|
|
||||||
stp = list_first_entry(&oo->oo_owner.so_stateids,
|
|
||||||
struct nfs4_ol_stateid, st_perstateowner);
|
|
||||||
release_open_stateid(stp);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void release_last_closed_stateid(struct nfs4_openowner *oo)
|
static void release_last_closed_stateid(struct nfs4_openowner *oo)
|
||||||
|
@ -1027,9 +1026,21 @@ static void release_last_closed_stateid(struct nfs4_openowner *oo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void release_openowner_stateids(struct nfs4_openowner *oo)
|
||||||
|
{
|
||||||
|
struct nfs4_ol_stateid *stp;
|
||||||
|
|
||||||
|
while (!list_empty(&oo->oo_owner.so_stateids)) {
|
||||||
|
stp = list_first_entry(&oo->oo_owner.so_stateids,
|
||||||
|
struct nfs4_ol_stateid, st_perstateowner);
|
||||||
|
release_open_stateid(stp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void release_openowner(struct nfs4_openowner *oo)
|
static void release_openowner(struct nfs4_openowner *oo)
|
||||||
{
|
{
|
||||||
unhash_openowner(oo);
|
unhash_openowner(oo);
|
||||||
|
release_openowner_stateids(oo);
|
||||||
list_del(&oo->oo_close_lru);
|
list_del(&oo->oo_close_lru);
|
||||||
release_last_closed_stateid(oo);
|
release_last_closed_stateid(oo);
|
||||||
nfs4_put_stateowner(&oo->oo_owner);
|
nfs4_put_stateowner(&oo->oo_owner);
|
||||||
|
@ -2994,6 +3005,13 @@ static void hash_openowner(struct nfs4_openowner *oo, struct nfs4_client *clp, u
|
||||||
list_add(&oo->oo_perclient, &clp->cl_openowners);
|
list_add(&oo->oo_perclient, &clp->cl_openowners);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void nfs4_unhash_openowner(struct nfs4_stateowner *so)
|
||||||
|
{
|
||||||
|
struct nfs4_openowner *oo = openowner(so);
|
||||||
|
|
||||||
|
unhash_openowner(oo);
|
||||||
|
}
|
||||||
|
|
||||||
static void nfs4_free_openowner(struct nfs4_stateowner *so)
|
static void nfs4_free_openowner(struct nfs4_stateowner *so)
|
||||||
{
|
{
|
||||||
struct nfs4_openowner *oo = openowner(so);
|
struct nfs4_openowner *oo = openowner(so);
|
||||||
|
@ -3002,7 +3020,8 @@ static void nfs4_free_openowner(struct nfs4_stateowner *so)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct nfs4_stateowner_operations openowner_ops = {
|
static const struct nfs4_stateowner_operations openowner_ops = {
|
||||||
.so_free = nfs4_free_openowner,
|
.so_unhash = nfs4_unhash_openowner,
|
||||||
|
.so_free = nfs4_free_openowner,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct nfs4_openowner *
|
static struct nfs4_openowner *
|
||||||
|
@ -4760,6 +4779,11 @@ find_lockowner_str(clientid_t *clid, struct xdr_netobj *owner,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void nfs4_unhash_lockowner(struct nfs4_stateowner *sop)
|
||||||
|
{
|
||||||
|
unhash_lockowner(lockowner(sop));
|
||||||
|
}
|
||||||
|
|
||||||
static void nfs4_free_lockowner(struct nfs4_stateowner *sop)
|
static void nfs4_free_lockowner(struct nfs4_stateowner *sop)
|
||||||
{
|
{
|
||||||
struct nfs4_lockowner *lo = lockowner(sop);
|
struct nfs4_lockowner *lo = lockowner(sop);
|
||||||
|
@ -4768,7 +4792,8 @@ static void nfs4_free_lockowner(struct nfs4_stateowner *sop)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct nfs4_stateowner_operations lockowner_ops = {
|
static const struct nfs4_stateowner_operations lockowner_ops = {
|
||||||
.so_free = nfs4_free_lockowner,
|
.so_unhash = nfs4_unhash_lockowner,
|
||||||
|
.so_free = nfs4_free_lockowner,
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -335,6 +335,7 @@ struct nfs4_replay {
|
||||||
struct nfs4_stateowner;
|
struct nfs4_stateowner;
|
||||||
|
|
||||||
struct nfs4_stateowner_operations {
|
struct nfs4_stateowner_operations {
|
||||||
|
void (*so_unhash)(struct nfs4_stateowner *);
|
||||||
void (*so_free)(struct nfs4_stateowner *);
|
void (*so_free)(struct nfs4_stateowner *);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue