Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

lockd: change nlmclnt_grant() to take a "struct sockaddr *" 



Adjust the signature and callers of nlmclnt_grant() to pass a "struct
sockaddr *" instead of a "struct sockaddr_in *" in order to support IPv6
addresses.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 6bfbe8af

fs/lockd/clntlock.c

+2 −3
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout) 
/*

 * The server lockd has called us back to tell us the lock was granted

 */

__be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock)

__be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock)

{

	const struct file_lock *fl = &lock->fl;

	const struct nfs_fh *fh = &lock->fh;
@@ -165,8 +165,7 @@ __be32 nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *lock 
		 */

		if (fl_blocked->fl_u.nfs_fl.owner->pid != lock->svid)

			continue;

		if (!nlm_cmp_addr(nlm_addr(block->b_host),

					(struct sockaddr *)addr))

		if (!nlm_cmp_addr(nlm_addr(block->b_host), addr))

			continue;

		if (nfs_compare_fh(NFS_FH(fl_blocked->fl_file->f_path.dentry->d_inode) ,fh) != 0)

			continue;

fs/lockd/svc4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, 
	resp->cookie = argp->cookie;



	dprintk("lockd: GRANTED       called\n");

	resp->status = nlmclnt_grant(svc_addr_in(rqstp), &argp->lock);

	resp->status = nlmclnt_grant(svc_addr(rqstp), &argp->lock);

	dprintk("lockd: GRANTED       status %d\n", ntohl(resp->status));

	return rpc_success;

}

fs/lockd/svcproc.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, 
	resp->cookie = argp->cookie;



	dprintk("lockd: GRANTED       called\n");

	resp->status = nlmclnt_grant(svc_addr_in(rqstp), &argp->lock);

	resp->status = nlmclnt_grant(svc_addr(rqstp), &argp->lock);

	dprintk("lockd: GRANTED       status %d\n", ntohl(resp->status));

	return rpc_success;

}

include/linux/lockd/lockd.h

+2 −1
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ int nlm_async_reply(struct nlm_rqst *, u32, const struct rpc_call_ops *); 
struct nlm_wait * nlmclnt_prepare_block(struct nlm_host *host, struct file_lock *fl);

void		  nlmclnt_finish_block(struct nlm_wait *block);

int		  nlmclnt_block(struct nlm_wait *block, struct nlm_rqst *req, long timeout);

__be32		  nlmclnt_grant(const struct sockaddr_in *addr, const struct nlm_lock *);

__be32		  nlmclnt_grant(const struct sockaddr *addr,

				const struct nlm_lock *lock);

void		  nlmclnt_recovery(struct nlm_host *);

int		  nlmclnt_reclaim(struct nlm_host *, struct file_lock *);

void		  nlmclnt_next_cookie(struct nlm_cookie *);