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

Commit db4e4c9a authored by Olaf Kirch's avatar Olaf Kirch Committed by Linus Torvalds
Browse files

[PATCH] knfsd: when looking up a lockd host, pass hostname & length 



This patch adds the peer's hostname (and name length) to all calls to
nlm*_lookup_host functions.  A subsequent patch will make use of these (is
requested by a sysctl).

Signed-off-by: default avatarOlaf Kirch <okir@suse.de>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cf712c24

fs/lockd/clntproc.c

+4 −1
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ nlmclnt_proc(struct inode *inode, int cmd, struct file_lock *fl) 
{

	struct rpc_clnt		*client = NFS_CLIENT(inode);

	struct sockaddr_in	addr;

	struct nfs_server	*nfssrv = NFS_SERVER(inode);

	struct nlm_host		*host;

	struct nlm_rqst		*call;

	sigset_t		oldset;
@@ -166,7 +167,9 @@ nlmclnt_proc(struct inode *inode, int cmd, struct file_lock *fl) 
	}



	rpc_peeraddr(client, (struct sockaddr *) &addr, sizeof(addr));

	host = nlmclnt_lookup_host(&addr, client->cl_xprt->prot, vers);

	host = nlmclnt_lookup_host(&addr, client->cl_xprt->prot, vers,

				   nfssrv->nfs_client->cl_hostname,

				   strlen(nfssrv->nfs_client->cl_hostname));

	if (host == NULL)

		return -ENOLCK;

fs/lockd/host.c

+25 −12
Original line number Diff line number Diff line
@@ -39,19 +39,23 @@ static void nlm_gc_hosts(void); 
 * Find an NLM server handle in the cache. If there is none, create it.

 */

struct nlm_host *

nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version)

nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,

			const char *hostname, int hostname_len)

{

	return nlm_lookup_host(0, sin, proto, version);

	return nlm_lookup_host(0, sin, proto, version,

			       hostname, hostname_len);

}



/*

 * Find an NLM client handle in the cache. If there is none, create it.

 */

struct nlm_host *

nlmsvc_lookup_host(struct svc_rqst *rqstp)

nlmsvc_lookup_host(struct svc_rqst *rqstp,

			const char *hostname, int hostname_len)

{

	return nlm_lookup_host(1, &rqstp->rq_addr,

			       rqstp->rq_prot, rqstp->rq_vers);

			       rqstp->rq_prot, rqstp->rq_vers,

			       hostname, hostname_len);

}



/*
@@ -59,14 +63,20 @@ nlmsvc_lookup_host(struct svc_rqst *rqstp) 
 */

struct nlm_host *

nlm_lookup_host(int server, const struct sockaddr_in *sin,

					int proto, int version)

					int proto, int version,

					const char *hostname,

					int hostname_len)

{

	struct nlm_host	*host, **hp;

	u32		addr;

	int		hash;



	dprintk("lockd: nlm_lookup_host(%08x, p=%d, v=%d)\n",

			(unsigned)(sin? ntohl(sin->sin_addr.s_addr) : 0), proto, version);

	dprintk("lockd: nlm_lookup_host(%u.%u.%u.%u, p=%d, v=%d, my role=%s, name=%.*s)\n",

			NIPQUAD(sin->sin_addr.s_addr), proto, version,

			server? "server" : "client",

			hostname_len,

			hostname? hostname : "<none>");





	hash = NLM_ADDRHASH(sin->sin_addr.s_addr);
@@ -267,19 +277,22 @@ void nlm_release_host(struct nlm_host *host) 
void nlm_host_rebooted(const struct sockaddr_in *sin, const struct nlm_reboot *argp)

{

	struct nlm_host *host;

	int server;



	/* Obtain the host pointer for this NFS server and try to

	 * reclaim all locks we hold on this server.

	 */

	if ((argp->proto & 1)==0) {

		/* We are client, he's the server: try to reclaim all locks. */

		if ((host = nlmclnt_lookup_host(sin, argp->proto >> 1, argp->vers)) == NULL)

	server = (argp->proto & 1)? 1 : 0;

	host = nlm_lookup_host(server, sin, argp->proto >> 1, argp->vers,

			argp->mon, argp->len);

	if (host == NULL)

		return;



	if (server == 0) {

		/* We are client, he's the server: try to reclaim all locks. */

		nlmclnt_recovery(host, argp->state);

	} else {

		/* He's the client, we're the server: delete all locks held by the client */

		if ((host = nlm_lookup_host(1, sin, argp->proto >> 1, argp->vers)) == NULL)

			return;

		nlmsvc_free_host_resources(host);

	}

	nlm_release_host(host);

fs/lockd/svc4proc.c

+4 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
		return nlm_lck_denied_nolocks;



	/* Obtain host handle */

	if (!(host = nlmsvc_lookup_host(rqstp))

	if (!(host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len))

	 || (argp->monitor && nsm_monitor(host) < 0))

		goto no_locks;

	*hostp = host;
@@ -260,7 +260,9 @@ static int nlm4svc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *a 
	struct nlm_rqst	*call;

	int stat;



	host = nlmsvc_lookup_host(rqstp);

	host = nlmsvc_lookup_host(rqstp,

				  argp->lock.caller,

				  argp->lock.len);

	if (host == NULL)

		return rpc_system_err;

fs/lockd/svclock.c

+2 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file, 
	struct nlm_rqst		*call = NULL;



	/* Create host handle for callback */

	host = nlmsvc_lookup_host(rqstp);

	host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);

	if (host == NULL)

		return NULL;
@@ -451,6 +451,7 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock, 
				(long long)conflock->fl.fl_start,

				(long long)conflock->fl.fl_end);

		conflock->caller = "somehost";	/* FIXME */

		conflock->len = strlen(conflock->caller);

		conflock->oh.len = 0;		/* don't return OH info */

		conflock->svid = conflock->fl.fl_pid;

		return nlm_lck_denied;

fs/lockd/svcproc.c

+4 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, 
		return nlm_lck_denied_nolocks;



	/* Obtain host handle */

	if (!(host = nlmsvc_lookup_host(rqstp))

	if (!(host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len))

	 || (argp->monitor && nsm_monitor(host) < 0))

		goto no_locks;

	*hostp = host;
@@ -287,7 +287,9 @@ static int nlmsvc_callback(struct svc_rqst *rqstp, u32 proc, struct nlm_args *ar 
	struct nlm_rqst	*call;

	int stat;



	host = nlmsvc_lookup_host(rqstp);

	host = nlmsvc_lookup_host(rqstp,

				  argp->lock.caller,

				  argp->lock.len);

	if (host == NULL)

		return rpc_system_err;