On Jan. 12, 2009, 1:52 +0200, "J. Bruce Fields" <bfields@xxxxxxxxxxxxxx> wrote:
> The flags here attempt to make the code more general, but I find it
> actually just adds confusion.
>
> I think it's clearer to separate the logic for the open and lock cases
> entirely. And eventually we may want to separate the stateowner and
> stateid types as well, as many of the fields aren't shared between the
> lock and open cases.
>
> Also move to eliminate forward references.
>
> Start with the stateid's.
>
> Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
> ---
> fs/nfsd/nfs4state.c | 49 ++++++++++++++++++++++++++-----------------------
> 1 files changed, 26 insertions(+), 23 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 88db7d3..6b8e5a9 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -119,7 +119,6 @@ opaque_hashval(const void *ptr, int nbytes)
>
> /* forward declarations */
> static void release_stateowner(struct nfs4_stateowner *sop);
> -static void release_stateid(struct nfs4_stateid *stp, int flags);
>
> /*
> * Delegation state
> @@ -311,6 +310,28 @@ static struct list_head unconf_id_hashtbl[CLIENT_HASH_SIZE];
> static struct list_head client_lru;
> static struct list_head close_lru;
>
> +static void release_generic_stateid(struct nfs4_stateid *stp)
> +{
> + list_del(&stp->st_hash);
> + list_del(&stp->st_perfile);
> + list_del(&stp->st_perstateowner);
> + put_nfs4_file(stp->st_file);
> + kmem_cache_free(stateid_slab, stp);
> +}
> +
> +static void release_lock_stateid(struct nfs4_stateid *stp)
> +{
> + locks_remove_posix(stp->st_vfs_file, (fl_owner_t)stp->st_stateowner);
> + release_generic_stateid(stp);
> +}
> +
> +static void release_open_stateid(struct nfs4_stateid *stp)
> +{
> + release_stateid_lockowners(stp);
> + nfsd_close(stp->st_vfs_file);
> + release_generic_stateid(stp);
Bruce, previously the state got unhashed before calling nfsd_close.
In the pnfs world we even go further and release the state lock
before diving into the filesystem since it may invoke callbacks
in the close path (recalling layouts in particular).
How about the code below?
Note that put_nfs4_file still happens in this proposal
after nfsd_close so not to change the current behavior, though
it might be possible to swap the order. I'm not sure about
the ramifications.
Benny
static void unhash_generic_stateid(struct nfs4_stateid *stp)
{
list_del(&stp->st_hash);
list_del(&stp->st_perfile);
list_del(&stp->st_perstateowner);
}
static void free_generic_stateid(struct nfs4_stateid *stp)
{
put_nfs4_file(stp->st_file);
kmem_cache_free(stateid_slab, stp);
}
static void release_open_stateid(struct nfs4_stateid *stp)
{
struct file *filp = stp->st_vfs_file;
release_stateid_lockowners(stp);
unhash_generic_stateid(stp);
nfsd_close(filep);
free_generic_stateid(stp);
}
> +}
> +
> static inline void
> renew_client(struct nfs4_client *clp)
> {
> @@ -1065,9 +1086,9 @@ unhash_stateowner(struct nfs4_stateowner *sop)
> stp = list_entry(sop->so_stateids.next,
> struct nfs4_stateid, st_perstateowner);
> if (sop->so_is_open_owner)
> - release_stateid(stp, OPEN_STATE);
> + release_open_stateid(stp);
> else
> - release_stateid(stp, LOCK_STATE);
> + release_lock_stateid(stp);
> }
> }
>
> @@ -1106,24 +1127,6 @@ init_stateid(struct nfs4_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *
> }
>
> static void
> -release_stateid(struct nfs4_stateid *stp, int flags)
> -{
> - struct file *filp = stp->st_vfs_file;
> -
> - list_del(&stp->st_hash);
> - list_del(&stp->st_perfile);
> - list_del(&stp->st_perstateowner);
> - if (flags & OPEN_STATE) {
> - release_stateid_lockowners(stp);
> - stp->st_vfs_file = NULL;
> - nfsd_close(filp);
> - } else if (flags & LOCK_STATE)
> - locks_remove_posix(filp, (fl_owner_t) stp->st_stateowner);
> - put_nfs4_file(stp->st_file);
> - kmem_cache_free(stateid_slab, stp);
> -}
> -
> -static void
> move_to_close_lru(struct nfs4_stateowner *sop)
> {
> dprintk("NFSD: move_to_close_lru nfs4_stateowner %p\n", sop);
> @@ -1764,7 +1767,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
> init_stateid(stp, fp, open);
> status = nfsd4_truncate(rqstp, current_fh, open);
> if (status) {
> - release_stateid(stp, OPEN_STATE);
> + release_open_stateid(stp);
> goto out;
> }
> }
> @@ -2373,7 +2376,7 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> memcpy(&close->cl_stateid, &stp->st_stateid, sizeof(stateid_t));
>
> /* release_stateid() calls nfsd_close() if needed */
> - release_stateid(stp, OPEN_STATE);
> + release_open_stateid(stp);
>
> /* place unused nfs4_stateowners on so_close_lru list to be
> * released by the laundromat service after the lease period
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
