2012-04-05 19:26:39

by Fred Isaman

Subject: [PATCH 1/1] NFS: check for req==NULL in nfs_try_to_update_request cleanup

Signed-off-by: Fred Isaman <[email protected]>
---
fs/nfs/write.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 2c68818..9b8d4d4 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -682,7 +682,8 @@ static struct nfs_page *nfs_try_to_update_request(struct inode *inode,
req->wb_bytes = rqend - req->wb_offset;
out_unlock:
spin_unlock(&inode->i_lock);
- nfs_clear_request_commit(req);
+ if (req)
+ nfs_clear_request_commit(req);
return req;
out_flushme:
spin_unlock(&inode->i_lock);
--
1.7.2.1

2012-04-06 02:14:28

by Myklebust, Trond

Subject: RE: [PATCH 1/1] NFS: check for req==NULL in nfs_try_to_update_request cleanup

PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBGcmVkIElzYW1hbiBbbWFpbHRv
Omlpc2FtYW5AbmV0YXBwLmNvbV0NCj4gU2VudDogVGh1cnNkYXksIEFwcmlsIDA1LCAyMDEyIDEy
OjI3IFBNDQo+IFRvOiBsaW51eC1uZnNAdmdlci5rZXJuZWwub3JnDQo+IENjOiBNeWtsZWJ1c3Qs
IFRyb25kDQo+IFN1YmplY3Q6IFtQQVRDSCAxLzFdIE5GUzogY2hlY2sgZm9yIHJlcT09TlVMTCBp
bg0KPiBuZnNfdHJ5X3RvX3VwZGF0ZV9yZXF1ZXN0IGNsZWFudXANCj4gDQo+IFNpZ25lZC1vZmYt
Ynk6IEZyZWQgSXNhbWFuIDxpaXNhbWFuQG5ldGFwcC5jb20+DQo+IC0tLQ0KPiAgZnMvbmZzL3dy
aXRlLmMgfCAgICAzICsrLQ0KPiAgMSBmaWxlcyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEg
ZGVsZXRpb25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZnMvbmZzL3dyaXRlLmMgYi9mcy9uZnMv
d3JpdGUuYyBpbmRleCAyYzY4ODE4Li45YjhkNGQ0IDEwMDY0NA0KPiAtLS0gYS9mcy9uZnMvd3Jp
dGUuYw0KPiArKysgYi9mcy9uZnMvd3JpdGUuYw0KPiBAQCAtNjgyLDcgKzY4Miw4IEBAIHN0YXRp
YyBzdHJ1Y3QgbmZzX3BhZ2UNCj4gKm5mc190cnlfdG9fdXBkYXRlX3JlcXVlc3Qoc3RydWN0IGlu
b2RlICppbm9kZSwNCj4gIAkJcmVxLT53Yl9ieXRlcyA9IHJxZW5kIC0gcmVxLT53Yl9vZmZzZXQ7
DQo+ICBvdXRfdW5sb2NrOg0KPiAgCXNwaW5fdW5sb2NrKCZpbm9kZS0+aV9sb2NrKTsNCj4gLQlu
ZnNfY2xlYXJfcmVxdWVzdF9jb21taXQocmVxKTsNCj4gKwlpZiAocmVxKQ0KPiArCQluZnNfY2xl
YXJfcmVxdWVzdF9jb21taXQocmVxKTsNCj4gIAlyZXR1cm4gcmVxOw0KPiAgb3V0X2ZsdXNobWU6
DQo+ICAJc3Bpbl91bmxvY2soJmlub2RlLT5pX2xvY2spOw0KPiAtLQ0KPiAxLjcuMi4xDQoNClRo
YW5rcyBGcmVkISBBcHBsaWVkIGFuZCBwdXNoZWQgdG8gdGhlIGJ1Z2ZpeGVzIGFuZCBsaW51eC1u
ZXh0IGJyYW5jaGVzLg0KDQpDaGVlcnMNCiAgVHJvbmQNCg==