Message ID | 1462993705-14673-2-git-send-email-andros@netapp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Andy, I think you're missing a word or two from the title of this patch. I'm guessing it should say "rename default callback ops"? Anna On 05/11/2016 03:08 PM, andros@netapp.com wrote: > From: Andy Adamson <andros@netapp.com> > > Also use with refactored exchange_id for session trunking > > Signed-off-by: Andy Adamson <andros@netapp.com> > --- > fs/nfs/nfs4proc.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index 327b8c3..da2aa2e 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -6784,12 +6784,12 @@ nfs41_same_server_scope(struct nfs41_server_scope *a, > } > > static void > -nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata) > +nfs4_proc_default_done(struct rpc_task *task, void *calldata) > { > } > > -static const struct rpc_call_ops nfs4_bind_one_conn_to_session_ops = { > - .rpc_call_done = &nfs4_bind_one_conn_to_session_done, > +static const struct rpc_call_ops nfs4_proc_default_ops = { > + .rpc_call_done = &nfs4_proc_default_done, > }; > > /* > @@ -6820,7 +6820,7 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt, > struct rpc_task_setup task_setup_data = { > .rpc_client = clnt, > .rpc_xprt = xprt, > - .callback_ops = &nfs4_bind_one_conn_to_session_ops, > + .callback_ops = &nfs4_proc_default_ops, > .rpc_message = &msg, > .flags = RPC_TASK_TIMEOUT, > }; > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
DQo+IE9uIE1heSAxNywgMjAxNiwgYXQgNDoxNyBQTSwgU2NodW1ha2VyLCBBbm5hIDxBbm5hLlNj aHVtYWtlckBuZXRhcHAuY29tPiB3cm90ZToNCj4gDQo+IEhpIEFuZHksDQo+IA0KPiBJIHRoaW5r IHlvdSdyZSBtaXNzaW5nIGEgd29yZCBvciB0d28gZnJvbSB0aGUgdGl0bGUgb2YgdGhpcyBwYXRj aC4gIEknbSBndWVzc2luZyBpdCBzaG91bGQgc2F5ICJyZW5hbWUgZGVmYXVsdCBjYWxsYmFjayBv cHPigJ0/DQoNClllcy4NCg0K4oCUPkFuZHkNCj4gDQo+IEFubmENCj4gDQo+IE9uIDA1LzExLzIw MTYgMDM6MDggUE0sIGFuZHJvc0BuZXRhcHAuY29tIHdyb3RlOg0KPj4gRnJvbTogQW5keSBBZGFt c29uIDxhbmRyb3NAbmV0YXBwLmNvbT4NCj4+IA0KPj4gQWxzbyB1c2Ugd2l0aCByZWZhY3RvcmVk IGV4Y2hhbmdlX2lkIGZvciBzZXNzaW9uIHRydW5raW5nDQo+PiANCj4+IFNpZ25lZC1vZmYtYnk6 IEFuZHkgQWRhbXNvbiA8YW5kcm9zQG5ldGFwcC5jb20+DQo+PiAtLS0NCj4+IGZzL25mcy9uZnM0 cHJvYy5jIHwgOCArKysrLS0tLQ0KPj4gMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwg NCBkZWxldGlvbnMoLSkNCj4+IA0KPj4gZGlmZiAtLWdpdCBhL2ZzL25mcy9uZnM0cHJvYy5jIGIv ZnMvbmZzL25mczRwcm9jLmMNCj4+IGluZGV4IDMyN2I4YzMuLmRhMmFhMmUgMTAwNjQ0DQo+PiAt LS0gYS9mcy9uZnMvbmZzNHByb2MuYw0KPj4gKysrIGIvZnMvbmZzL25mczRwcm9jLmMNCj4+IEBA IC02Nzg0LDEyICs2Nzg0LDEyIEBAIG5mczQxX3NhbWVfc2VydmVyX3Njb3BlKHN0cnVjdCBuZnM0 MV9zZXJ2ZXJfc2NvcGUgKmEsDQo+PiB9DQo+PiANCj4+IHN0YXRpYyB2b2lkDQo+PiAtbmZzNF9i aW5kX29uZV9jb25uX3RvX3Nlc3Npb25fZG9uZShzdHJ1Y3QgcnBjX3Rhc2sgKnRhc2ssIHZvaWQg KmNhbGxkYXRhKQ0KPj4gK25mczRfcHJvY19kZWZhdWx0X2RvbmUoc3RydWN0IHJwY190YXNrICp0 YXNrLCB2b2lkICpjYWxsZGF0YSkNCj4+IHsNCj4+IH0NCj4+IA0KPj4gLXN0YXRpYyBjb25zdCBz dHJ1Y3QgcnBjX2NhbGxfb3BzIG5mczRfYmluZF9vbmVfY29ubl90b19zZXNzaW9uX29wcyA9IHsN Cj4+IC0JLnJwY19jYWxsX2RvbmUgPSAgJm5mczRfYmluZF9vbmVfY29ubl90b19zZXNzaW9uX2Rv bmUsDQo+PiArc3RhdGljIGNvbnN0IHN0cnVjdCBycGNfY2FsbF9vcHMgbmZzNF9wcm9jX2RlZmF1 bHRfb3BzID0gew0KPj4gKwkucnBjX2NhbGxfZG9uZSA9ICAmbmZzNF9wcm9jX2RlZmF1bHRfZG9u ZSwNCj4+IH07DQo+PiANCj4+IC8qDQo+PiBAQCAtNjgyMCw3ICs2ODIwLDcgQEAgaW50IG5mczRf cHJvY19iaW5kX29uZV9jb25uX3RvX3Nlc3Npb24oc3RydWN0IHJwY19jbG50ICpjbG50LA0KPj4g CXN0cnVjdCBycGNfdGFza19zZXR1cCB0YXNrX3NldHVwX2RhdGEgPSB7DQo+PiAJCS5ycGNfY2xp ZW50ID0gY2xudCwNCj4+IAkJLnJwY194cHJ0ID0geHBydCwNCj4+IC0JCS5jYWxsYmFja19vcHMg PSAmbmZzNF9iaW5kX29uZV9jb25uX3RvX3Nlc3Npb25fb3BzLA0KPj4gKwkJLmNhbGxiYWNrX29w cyA9ICZuZnM0X3Byb2NfZGVmYXVsdF9vcHMsDQo+PiAJCS5ycGNfbWVzc2FnZSA9ICZtc2csDQo+ PiAJCS5mbGFncyA9IFJQQ19UQVNLX1RJTUVPVVQsDQo+PiAJfTsNCj4+IA0KPiANCg0K -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 327b8c3..da2aa2e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6784,12 +6784,12 @@ nfs41_same_server_scope(struct nfs41_server_scope *a, } static void -nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata) +nfs4_proc_default_done(struct rpc_task *task, void *calldata) { } -static const struct rpc_call_ops nfs4_bind_one_conn_to_session_ops = { - .rpc_call_done = &nfs4_bind_one_conn_to_session_done, +static const struct rpc_call_ops nfs4_proc_default_ops = { + .rpc_call_done = &nfs4_proc_default_done, }; /* @@ -6820,7 +6820,7 @@ int nfs4_proc_bind_one_conn_to_session(struct rpc_clnt *clnt, struct rpc_task_setup task_setup_data = { .rpc_client = clnt, .rpc_xprt = xprt, - .callback_ops = &nfs4_bind_one_conn_to_session_ops, + .callback_ops = &nfs4_proc_default_ops, .rpc_message = &msg, .flags = RPC_TASK_TIMEOUT, };