Commit 2dc6f19e authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Chuck Lever
Browse files

nlm: minor nlm_lookup_file argument change 



It'll come in handy to get the whole nlm_lock.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 7de875b2

fs/lockd/svc4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 


	/* Obtain file pointer. Not used by FREE_ALL call. */

	if (filp != NULL) {

		if ((error = nlm_lookup_file(rqstp, &file, &lock->fh)) != 0)

		error = nlm_lookup_file(rqstp, &file, lock);

		if (error)

			goto no_locks;

		*filp = file;

fs/lockd/svcproc.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 


	/* Obtain file pointer. Not used by FREE_ALL call. */

	if (filp != NULL) {

		error = cast_status(nlm_lookup_file(rqstp, &file, &lock->fh));

		error = cast_status(nlm_lookup_file(rqstp, &file, lock));

		if (error != 0)

			goto no_locks;

		*filp = file;

fs/lockd/svcsubs.c

+8 −7
Original line number Diff line number Diff line
@@ -82,31 +82,31 @@ static inline unsigned int file_hash(struct nfs_fh *f) 
 */

__be32

nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,

					struct nfs_fh *f)

					struct nlm_lock *lock)

{

	struct nlm_file	*file;

	unsigned int	hash;

	__be32		nfserr;



	nlm_debug_print_fh("nlm_lookup_file", f);

	nlm_debug_print_fh("nlm_lookup_file", &lock->fh);



	hash = file_hash(f);

	hash = file_hash(&lock->fh);



	/* Lock file table */

	mutex_lock(&nlm_file_mutex);



	hlist_for_each_entry(file, &nlm_files[hash], f_list)

		if (!nfs_compare_fh(&file->f_handle, f))

		if (!nfs_compare_fh(&file->f_handle, &lock->fh))

			goto found;



	nlm_debug_print_fh("creating file for", f);

	nlm_debug_print_fh("creating file for", &lock->fh);



	nfserr = nlm_lck_denied_nolocks;

	file = kzalloc(sizeof(*file), GFP_KERNEL);

	if (!file)

		goto out_unlock;



	memcpy(&file->f_handle, f, sizeof(struct nfs_fh));

	memcpy(&file->f_handle, &lock->fh, sizeof(struct nfs_fh));

	mutex_init(&file->f_mutex);

	INIT_HLIST_NODE(&file->f_list);

	INIT_LIST_HEAD(&file->f_blocks);
@@ -117,7 +117,8 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, 
	 * We have to make sure we have the right credential to open

	 * the file.

	 */

	if ((nfserr = nlmsvc_ops->fopen(rqstp, f, &file->f_file)) != 0) {

	nfserr = nlmsvc_ops->fopen(rqstp, &lock->fh, &file->f_file);

	if (nfserr) {

		dprintk("lockd: open failed (error %d)\n", nfserr);

		goto out_free;

	}

include/linux/lockd/lockd.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ void nlmsvc_locks_init_private(struct file_lock *, struct nlm_host *, pid_t); 
 * File handling for the server personality

 */

__be32		  nlm_lookup_file(struct svc_rqst *, struct nlm_file **,

					struct nfs_fh *);

					struct nlm_lock *);

void		  nlm_release_file(struct nlm_file *);

void		  nlmsvc_release_lockowner(struct nlm_lock *);

void		  nlmsvc_mark_resources(struct net *);