From patchwork Wed Dec 29 13:14:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 439371 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBUMBEjL000490 for ; Thu, 30 Dec 2010 22:11:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752880Ab0L2NRE (ORCPT ); Wed, 29 Dec 2010 08:17:04 -0500 Received: from shutemov.name ([188.40.19.243]:33582 "EHLO shutemov.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752680Ab0L2NOe (ORCPT ); Wed, 29 Dec 2010 08:14:34 -0500 Received: by shutemov.name (Postfix, from userid 500) id E104BD4219; Wed, 29 Dec 2010 15:14:31 +0200 (EET) From: "Kirill A. Shutemov" To: Trond Myklebust , "J. Bruce Fields" , Neil Brown Cc: Pavel Emelyanov , linux-nfs@vger.kernel.org, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH v2 06/12] lockd: get rpc_pipefs mount point from callers Date: Wed, 29 Dec 2010 15:14:24 +0200 Message-Id: <1293628470-28386-7-git-send-email-kas@openvz.org> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1293628470-28386-1-git-send-email-kas@openvz.org> References: <1293628470-28386-1-git-send-email-kas@openvz.org> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Dec 2010 22:11:21 +0000 (UTC) diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index 25509eb..1179c18 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c @@ -56,13 +56,14 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init) u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4; int status; - status = lockd_up(); + status = lockd_up(nlm_init->rpcmount); if (status < 0) return ERR_PTR(status); host = nlmclnt_lookup_host(nlm_init->address, nlm_init->addrlen, nlm_init->protocol, nlm_version, - nlm_init->hostname, nlm_init->noresvport); + nlm_init->hostname, nlm_init->noresvport, + nlm_init->rpcmount); if (host == NULL) { lockd_down(); return ERR_PTR(-ENOLCK); @@ -223,7 +224,8 @@ reclaimer(void *ptr) allow_signal(SIGKILL); down_write(&host->h_rwsem); - lockd_up(); /* note: this cannot fail as lockd is already running */ + /* note: this cannot fail as lockd is already running */ + lockd_up(host->h_rpcmount); dprintk("lockd: reclaiming locks for host %s\n", host->h_name); diff --git a/fs/lockd/host.c b/fs/lockd/host.c index b033a2d..757d1d3 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -14,9 +14,9 @@ #include #include #include -#include #include #include +#include #include @@ -44,6 +44,7 @@ struct nlm_lookup_host_info { const struct sockaddr *src_sap; /* our address (optional) */ const size_t src_len; /* it's length */ const int noresvport; /* use non-priv port */ + struct vfsmount *rpcmount; /* rpc_pipefs mount point */ }; /* @@ -128,6 +129,8 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) if (ni->server && ni->src_len != 0 && !rpc_cmp_addr(nlm_srcaddr(host), ni->src_sap)) continue; + if (host->h_rpcmount->mnt_sb != ni->rpcmount->mnt_sb) + continue; /* Move to head of hash chain. */ hlist_del(&host->h_hash); @@ -171,6 +174,7 @@ static struct nlm_host *nlm_lookup_host(struct nlm_lookup_host_info *ni) host->h_srcaddrlen = ni->src_len; host->h_version = ni->version; host->h_proto = ni->protocol; + host->h_rpcmount = mntget(ni->rpcmount); host->h_rpcclnt = NULL; mutex_init(&host->h_mutex); host->h_nextrebind = jiffies + NLM_HOST_REBIND; @@ -212,6 +216,7 @@ nlm_destroy_host(struct nlm_host *host) nsm_unmonitor(host); nsm_release(host->h_nsmhandle); + mntput(host->h_rpcmount); clnt = host->h_rpcclnt; if (clnt != NULL) @@ -238,7 +243,8 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, const unsigned short protocol, const u32 version, const char *hostname, - int noresvport) + int noresvport, + struct vfsmount *rpcmount) { struct nlm_lookup_host_info ni = { .server = 0, @@ -249,6 +255,7 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, .hostname = hostname, .hostname_len = strlen(hostname), .noresvport = noresvport, + .rpcmount = rpcmount, }; dprintk("lockd: %s(host='%s', vers=%u, proto=%s)\n", __func__, @@ -295,6 +302,7 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp, .hostname = hostname, .hostname_len = hostname_len, .src_len = rqstp->rq_addrlen, + .rpcmount = rqstp->rq_server->sv_rpcmount, }; dprintk("lockd: %s(host='%*s', vers=%u, proto=%s)\n", __func__, @@ -361,7 +369,7 @@ nlm_bind_host(struct nlm_host *host) .authflavor = RPC_AUTH_UNIX, .flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_AUTOBIND), - .rpcmount = init_rpc_pipefs, + .rpcmount = host->h_rpcmount, }; /* diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 37e5328..526d486 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -63,7 +62,7 @@ static inline struct sockaddr *nsm_addr(const struct nsm_handle *nsm) return (struct sockaddr *)&nsm->sm_addr; } -static struct rpc_clnt *nsm_create(void) +static struct rpc_clnt *nsm_create(struct vfsmount *rpcmount) { struct sockaddr_in sin = { .sin_family = AF_INET, @@ -79,13 +78,14 @@ static struct rpc_clnt *nsm_create(void) .version = NSM_VERSION, .authflavor = RPC_AUTH_NULL, .flags = RPC_CLNT_CREATE_NOPING, - .rpcmount = init_rpc_pipefs, + .rpcmount = rpcmount, }; return rpc_create(&args); } -static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res) +static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res, + struct vfsmount *rpcmount) { struct rpc_clnt *clnt; int status; @@ -101,7 +101,7 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res) .rpc_resp = res, }; - clnt = nsm_create(); + clnt = nsm_create(rpcmount); if (IS_ERR(clnt)) { status = PTR_ERR(clnt); dprintk("lockd: failed to create NSM upcall transport, " @@ -151,7 +151,7 @@ int nsm_monitor(const struct nlm_host *host) */ nsm->sm_mon_name = nsm_use_hostnames ? nsm->sm_name : nsm->sm_addrbuf; - status = nsm_mon_unmon(nsm, NSMPROC_MON, &res); + status = nsm_mon_unmon(nsm, NSMPROC_MON, &res, host->h_rpcmount); if (unlikely(res.status != 0)) status = -EIO; if (unlikely(status < 0)) { @@ -185,7 +185,8 @@ void nsm_unmonitor(const struct nlm_host *host) && nsm->sm_monitored && !nsm->sm_sticky) { dprintk("lockd: nsm_unmonitor(%s)\n", nsm->sm_name); - status = nsm_mon_unmon(nsm, NSMPROC_UNMON, &res); + status = nsm_mon_unmon(nsm, NSMPROC_UNMON, &res, + host->h_rpcmount); if (res.status != 0) status = -EIO; if (status < 0) diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 32310b1..7387b04 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -249,7 +248,7 @@ out_err: /* * Bring up the lockd process if it's not already up. */ -int lockd_up(void) +int lockd_up(struct vfsmount *rpcmount) { struct svc_serv *serv; int error = 0; @@ -270,8 +269,7 @@ int lockd_up(void) "lockd_up: no pid, %d users??\n", nlmsvc_users); error = -ENOMEM; - serv = svc_create(&nlmsvc_program, init_rpc_pipefs, LOCKD_BUFSIZE, - NULL); + serv = svc_create(&nlmsvc_program, rpcmount, LOCKD_BUFSIZE, NULL); if (!serv) { printk(KERN_WARNING "lockd_up: create service failed\n"); goto out; diff --git a/fs/nfs/client.c b/fs/nfs/client.c index e041f39..fbc013d 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -661,6 +661,7 @@ static int nfs_start_lockd(struct nfs_server *server) .nfs_version = clp->rpc_ops->version, .noresvport = server->flags & NFS_MOUNT_NORESVPORT ? 1 : 0, + .rpcmount = init_rpc_pipefs, }; if (nlm_init.nfs_version > 3) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index d96c32b..17d78d3 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -220,7 +220,7 @@ static int nfsd_startup(unsigned short port, int nrservs) ret = nfsd_init_socks(port); if (ret) goto out_racache; - ret = lockd_up(); + ret = lockd_up(init_rpc_pipefs); if (ret) goto out_racache; ret = nfs4_state_start(); diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h index fbc48f8..97cd4bf 100644 --- a/include/linux/lockd/bind.h +++ b/include/linux/lockd/bind.h @@ -42,6 +42,7 @@ struct nlmclnt_initdata { unsigned short protocol; u32 nfs_version; int noresvport; + struct vfsmount *rpcmount; }; /* @@ -53,7 +54,7 @@ extern void nlmclnt_done(struct nlm_host *host); extern int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl); -extern int lockd_up(void); +extern int lockd_up(struct vfsmount *rpcmount); extern void lockd_down(void); #endif /* LINUX_LOCKD_BIND_H */ diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 2dee05e..e30b07d 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -44,6 +44,7 @@ struct nlm_host { size_t h_addrlen; struct sockaddr_storage h_srcaddr; /* our address (optional) */ size_t h_srcaddrlen; + struct vfsmount *h_rpcmount; /* rpc_pipefs mount point */ struct rpc_clnt *h_rpcclnt; /* RPC client to talk to peer */ char *h_name; /* remote hostname */ u32 h_version; /* interface version */ @@ -222,7 +223,8 @@ struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap, const unsigned short protocol, const u32 version, const char *hostname, - int noresvport); + int noresvport, + struct vfsmount *rpcmount); struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp, const char *hostname, const size_t hostname_len);