* [PATCH 1/1] NFSv4.1 set the cl_hostname for data servers
@ 2012-02-15 20:59 andros
2012-02-16 19:31 ` Myklebust, Trond
0 siblings, 1 reply; 2+ messages in thread
From: andros @ 2012-02-15 20:59 UTC (permalink / raw)
To: trond.myklebust.netapp.com; +Cc: linux-nfs, Andy Adamson
From: Andy Adamson <andros@netapp.com>
Used by /proc/fs/nfsfs files.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/client.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index d0f850f..9e9cb50 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1468,7 +1468,21 @@ struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
*/
clp = nfs_get_client(&cl_init, &ds_timeout, mds_clp->cl_ipaddr,
mds_clp->cl_rpcclient->cl_auth->au_flavor, 0);
+ if (IS_ERR(clp))
+ return clp;
+ /*
+ * cl_init.servername is NULL so the cl_hostname is not set for new
+ * ds nfs_clients
+ */
+ if (clp->cl_hostname == NULL) {
+ clp->cl_hostname = kstrdup(clp->cl_rpcclient->cl_server,
+ GFP_KERNEL);
+ if (clp->cl_hostname == NULL) {
+ nfs_put_client(clp);
+ return ERR_PTR(-ENOMEM);
+ }
+ }
dprintk("<-- %s %p\n", __func__, clp);
return clp;
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] NFSv4.1 set the cl_hostname for data servers
2012-02-15 20:59 [PATCH 1/1] NFSv4.1 set the cl_hostname for data servers andros
@ 2012-02-16 19:31 ` Myklebust, Trond
0 siblings, 0 replies; 2+ messages in thread
From: Myklebust, Trond @ 2012-02-16 19:31 UTC (permalink / raw)
To: Adamson, Andy; +Cc: linux-nfs
T24gV2VkLCAyMDEyLTAyLTE1IGF0IDE1OjU5IC0wNTAwLCBhbmRyb3NAbmV0YXBwLmNvbSB3cm90
ZToNCj4gRnJvbTogQW5keSBBZGFtc29uIDxhbmRyb3NAbmV0YXBwLmNvbT4NCj4gDQo+IFVzZWQg
YnkgL3Byb2MvZnMvbmZzZnMgZmlsZXMuDQo+IA0KPiBTaWduZWQtb2ZmLWJ5OiBBbmR5IEFkYW1z
b24gPGFuZHJvc0BuZXRhcHAuY29tPg0KPiAtLS0NCj4gIGZzL25mcy9jbGllbnQuYyB8ICAgMTQg
KysrKysrKysrKysrKysNCj4gIDEgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMCBk
ZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9mcy9uZnMvY2xpZW50LmMgYi9mcy9uZnMv
Y2xpZW50LmMNCj4gaW5kZXggZDBmODUwZi4uOWU5Y2I1MCAxMDA2NDQNCj4gLS0tIGEvZnMvbmZz
L2NsaWVudC5jDQo+ICsrKyBiL2ZzL25mcy9jbGllbnQuYw0KPiBAQCAtMTQ2OCw3ICsxNDY4LDIx
IEBAIHN0cnVjdCBuZnNfY2xpZW50ICpuZnM0X3NldF9kc19jbGllbnQoc3RydWN0IG5mc19jbGll
bnQqIG1kc19jbHAsDQo+ICAJICovDQo+ICAJY2xwID0gbmZzX2dldF9jbGllbnQoJmNsX2luaXQs
ICZkc190aW1lb3V0LCBtZHNfY2xwLT5jbF9pcGFkZHIsDQo+ICAJCQkgICAgIG1kc19jbHAtPmNs
X3JwY2NsaWVudC0+Y2xfYXV0aC0+YXVfZmxhdm9yLCAwKTsNCj4gKwlpZiAoSVNfRVJSKGNscCkp
DQo+ICsJCXJldHVybiBjbHA7DQo+ICANCj4gKwkvKg0KPiArCSAqIGNsX2luaXQuc2VydmVybmFt
ZSBpcyBOVUxMIHNvIHRoZSBjbF9ob3N0bmFtZSBpcyBub3Qgc2V0IGZvciBuZXcNCj4gKwkgKiBk
cyBuZnNfY2xpZW50cw0KPiArCSAqLw0KPiArCWlmIChjbHAtPmNsX2hvc3RuYW1lID09IE5VTEwp
IHsNCj4gKwkJY2xwLT5jbF9ob3N0bmFtZSA9IGtzdHJkdXAoY2xwLT5jbF9ycGNjbGllbnQtPmNs
X3NlcnZlciwNCj4gKwkJCQkJICAgR0ZQX0tFUk5FTCk7DQo+ICsJCWlmIChjbHAtPmNsX2hvc3Ru
YW1lID09IE5VTEwpIHsNCj4gKwkJCW5mc19wdXRfY2xpZW50KGNscCk7DQo+ICsJCQlyZXR1cm4g
RVJSX1BUUigtRU5PTUVNKTsNCj4gKwkJfQ0KPiArCX0NCj4gIAlkcHJpbnRrKCI8LS0gJXMgJXBc
biIsIF9fZnVuY19fLCBjbHApOw0KPiAgCXJldHVybiBjbHA7DQo+ICB9DQoNCkNvdWxkIHdlIHBs
ZWFzZSBqdXN0IHNldCBpdCBjb3JyZWN0bHkgaW4gdGhlIGNsX2luaXQgc3RydWN0dXJlIGluDQpu
ZnM0X3NldF9kc19jbGllbnQgaW5zdGVhZD8NCg0KLS0gDQpUcm9uZCBNeWtsZWJ1c3QNCkxpbnV4
IE5GUyBjbGllbnQgbWFpbnRhaW5lcg0KDQpOZXRBcHANClRyb25kLk15a2xlYnVzdEBuZXRhcHAu
Y29tDQp3d3cubmV0YXBwLmNvbQ0KDQo=
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-16 19:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-15 20:59 [PATCH 1/1] NFSv4.1 set the cl_hostname for data servers andros
2012-02-16 19:31 ` Myklebust, Trond
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.