On Mon, Aug 06, 2012 at 11:00:27AM -0400, Jeff Layton wrote:
> locks.c doesn't use the BKL anymore and there is no fi_perfile field.
>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
> fs/nfsd/nfs4state.c | 6 +-----
> fs/nfsd/state.h | 6 +-----
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index cc894ed..d8a7ddf 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -4151,11 +4151,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> file_lock.fl_end = last_byte_offset(lock->lk_offset, lock->lk_length);
> nfs4_transform_lock_offset(&file_lock);
>
> - /*
> - * Try to lock the file in the VFS.
> - * Note: locks.c uses the BKL to protect the inode's lock list.
> - */
> -
> + /* Try to lock the file in the VFS. */
Thanks, applying, but: mind if I just drop this comment entirely? "Try
to lock the file in the VFS" doesn't add much to "vfs_lock_file()".
--b.
> err = vfs_lock_file(filp, F_SETLK, &file_lock, &conflock);
> switch (-err) {
> case 0: /* success! */
> diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
> index e617314..cce91c8 100644
> --- a/fs/nfsd/state.h
> +++ b/fs/nfsd/state.h
> @@ -374,11 +374,7 @@ static inline struct nfs4_lockowner * lockowner(struct nfs4_stateowner *so)
> return container_of(so, struct nfs4_lockowner, lo_owner);
> }
>
> -/*
> -* nfs4_file: a file opened by some number of (open) nfs4_stateowners.
> -* o fi_perfile list is used to search for conflicting
> -* share_acces, share_deny on the file.
> -*/
> +/* nfs4_file: a file opened by some number of (open) nfs4_stateowners. */
> struct nfs4_file {
> atomic_t fi_ref;
> struct list_head fi_hash; /* hash by "struct inode *" */
> --
> 1.7.11.2
>
--
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
