diff for duplicates of <1493233499.2326.1.camel@primarydata.com> diff --git a/a/1.txt b/N1/1.txt index fba4e98..f7bdaf2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,19 +1,39 @@ -T24gV2VkLCAyMDE3LTA0LTI2IGF0IDIwOjQ1ICswMjAwLCBGYWJpYW4gRnJlZGVyaWNrIHdyb3Rl -Og0KPiBSZW1vdmUgTlVMTCB0ZXN0IG9uIGttYXAoKQ0KPiANCj4gU2lnbmVkLW9mZi1ieTogRmFi -aWFuIEZyZWRlcmljayA8ZmFiZkBza3luZXQuYmU+DQo+IC0tLQ0KPiBWMjogUmVtb3ZlIHB0ciBh -bmQgcmV0dXJuIGttYXAocGFnZSkgZGlyZWN0bHkNCj4gKFN1Z2dlc3RlZCBieSBBbm5hIFNjaHVt -YWtlcikNCj4gDQo+IMKgZnMvbmZzL2Rpci5jIHwgNiArLS0tLS0NCj4gwqAxIGZpbGUgY2hhbmdl -ZCwgMSBpbnNlcnRpb24oKyksIDUgZGVsZXRpb25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZnMv -bmZzL2Rpci5jIGIvZnMvbmZzL2Rpci5jDQo+IGluZGV4IDNhMTg4Y2IuLjEyZWQ4MDZiIDEwMDY0 -NA0KPiAtLS0gYS9mcy9uZnMvZGlyLmMNCj4gKysrIGIvZnMvbmZzL2Rpci5jDQo+IEBAIC0xNzUs -MTMgKzE3NSw5IEBAIHR5cGVkZWYgc3RydWN0IHsNCj4gwqBzdGF0aWMNCj4gwqBzdHJ1Y3QgbmZz -X2NhY2hlX2FycmF5ICpuZnNfcmVhZGRpcl9nZXRfYXJyYXkoc3RydWN0IHBhZ2UgKnBhZ2UpDQo+ -IMKgew0KPiAtCXZvaWQgKnB0cjsNCj4gwqAJaWYgKHBhZ2UgPT0gTlVMTCkNCj4gwqAJCXJldHVy -biBFUlJfUFRSKC1FSU8pOw0KPiAtCXB0ciA9IGttYXAocGFnZSk7DQo+IC0JaWYgKHB0ciA9PSBO -VUxMKQ0KPiAtCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsNCj4gLQlyZXR1cm4gcHRyOw0KPiAr -CXJldHVybiBrbWFwKHBhZ2UpOw0KPiDCoH0NCj4gwqANCj4gwqBzdGF0aWMNCg0KVGhlcmUgc2Vl -bXMgbGl0dGxlIHZhbHVlIGluIGhhdmluZyBhIHdyYXBwZXIgdG8ga21hcC4uLiBDYW4gd2UgcGVy -aGFwcw0KaW5zdGVhZCBqdXN0IGdldCByaWQgb2YgYm90aCBuZnNfcmVhZGRpcl9nZXRfYXJyYXkg -YW5kDQpuZnNfcmVhZGRpcl9yZWxlYXNlX2FycmF5Pw0KDQotLSANClRyb25kIE15a2xlYnVzdA0K -TGludXggTkZTIGNsaWVudCBtYWludGFpbmVyLCBQcmltYXJ5RGF0YQ0KdHJvbmQubXlrbGVidXN0 -QHByaW1hcnlkYXRhLmNvbQ0K +On Wed, 2017-04-26 at 20:45 +0200, Fabian Frederick wrote: +> Remove NULL test on kmap() +> +> Signed-off-by: Fabian Frederick <fabf@skynet.be> +> --- +> V2: Remove ptr and return kmap(page) directly +> (Suggested by Anna Schumaker) +> +> fs/nfs/dir.c | 6 +----- +> 1 file changed, 1 insertion(+), 5 deletions(-) +> +> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c +> index 3a188cb..12ed806b 100644 +> --- a/fs/nfs/dir.c +> +++ b/fs/nfs/dir.c +> @@ -175,13 +175,9 @@ typedef struct { +> static +> struct nfs_cache_array *nfs_readdir_get_array(struct page *page) +> { +> - void *ptr; +> if (page == NULL) +> return ERR_PTR(-EIO); +> - ptr = kmap(page); +> - if (ptr == NULL) +> - return ERR_PTR(-ENOMEM); +> - return ptr; +> + return kmap(page); +> } +> +> static + +There seems little value in having a wrapper to kmap... Can we perhaps +instead just get rid of both nfs_readdir_get_array and +nfs_readdir_release_array? + +-- +Trond Myklebust +Linux NFS client maintainer, PrimaryData +trond.myklebust@primarydata.com diff --git a/a/content_digest b/N1/content_digest index a93ec70..1bdd808 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,24 +9,44 @@ " linux-nfs@vger.kernel.org <linux-nfs@vger.kernel.org>\0" "\00:1\0" "b\0" - "T24gV2VkLCAyMDE3LTA0LTI2IGF0IDIwOjQ1ICswMjAwLCBGYWJpYW4gRnJlZGVyaWNrIHdyb3Rl\n" - "Og0KPiBSZW1vdmUgTlVMTCB0ZXN0IG9uIGttYXAoKQ0KPiANCj4gU2lnbmVkLW9mZi1ieTogRmFi\n" - "aWFuIEZyZWRlcmljayA8ZmFiZkBza3luZXQuYmU+DQo+IC0tLQ0KPiBWMjogUmVtb3ZlIHB0ciBh\n" - "bmQgcmV0dXJuIGttYXAocGFnZSkgZGlyZWN0bHkNCj4gKFN1Z2dlc3RlZCBieSBBbm5hIFNjaHVt\n" - "YWtlcikNCj4gDQo+IMKgZnMvbmZzL2Rpci5jIHwgNiArLS0tLS0NCj4gwqAxIGZpbGUgY2hhbmdl\n" - "ZCwgMSBpbnNlcnRpb24oKyksIDUgZGVsZXRpb25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZnMv\n" - "bmZzL2Rpci5jIGIvZnMvbmZzL2Rpci5jDQo+IGluZGV4IDNhMTg4Y2IuLjEyZWQ4MDZiIDEwMDY0\n" - "NA0KPiAtLS0gYS9mcy9uZnMvZGlyLmMNCj4gKysrIGIvZnMvbmZzL2Rpci5jDQo+IEBAIC0xNzUs\n" - "MTMgKzE3NSw5IEBAIHR5cGVkZWYgc3RydWN0IHsNCj4gwqBzdGF0aWMNCj4gwqBzdHJ1Y3QgbmZz\n" - "X2NhY2hlX2FycmF5ICpuZnNfcmVhZGRpcl9nZXRfYXJyYXkoc3RydWN0IHBhZ2UgKnBhZ2UpDQo+\n" - "IMKgew0KPiAtCXZvaWQgKnB0cjsNCj4gwqAJaWYgKHBhZ2UgPT0gTlVMTCkNCj4gwqAJCXJldHVy\n" - "biBFUlJfUFRSKC1FSU8pOw0KPiAtCXB0ciA9IGttYXAocGFnZSk7DQo+IC0JaWYgKHB0ciA9PSBO\n" - "VUxMKQ0KPiAtCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsNCj4gLQlyZXR1cm4gcHRyOw0KPiAr\n" - "CXJldHVybiBrbWFwKHBhZ2UpOw0KPiDCoH0NCj4gwqANCj4gwqBzdGF0aWMNCg0KVGhlcmUgc2Vl\n" - "bXMgbGl0dGxlIHZhbHVlIGluIGhhdmluZyBhIHdyYXBwZXIgdG8ga21hcC4uLiBDYW4gd2UgcGVy\n" - "aGFwcw0KaW5zdGVhZCBqdXN0IGdldCByaWQgb2YgYm90aCBuZnNfcmVhZGRpcl9nZXRfYXJyYXkg\n" - "YW5kDQpuZnNfcmVhZGRpcl9yZWxlYXNlX2FycmF5Pw0KDQotLSANClRyb25kIE15a2xlYnVzdA0K\n" - "TGludXggTkZTIGNsaWVudCBtYWludGFpbmVyLCBQcmltYXJ5RGF0YQ0KdHJvbmQubXlrbGVidXN0\n" - QHByaW1hcnlkYXRhLmNvbQ0K + "On Wed, 2017-04-26 at 20:45 +0200, Fabian Frederick wrote:\n" + "> Remove NULL test on kmap()\n" + "> \n" + "> Signed-off-by: Fabian Frederick <fabf@skynet.be>\n" + "> ---\n" + "> V2: Remove ptr and return kmap(page) directly\n" + "> (Suggested by Anna Schumaker)\n" + "> \n" + "> \302\240fs/nfs/dir.c | 6 +-----\n" + "> \302\2401 file changed, 1 insertion(+), 5 deletions(-)\n" + "> \n" + "> diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c\n" + "> index 3a188cb..12ed806b 100644\n" + "> --- a/fs/nfs/dir.c\n" + "> +++ b/fs/nfs/dir.c\n" + "> @@ -175,13 +175,9 @@ typedef struct {\n" + "> \302\240static\n" + "> \302\240struct nfs_cache_array *nfs_readdir_get_array(struct page *page)\n" + "> \302\240{\n" + "> -\tvoid *ptr;\n" + "> \302\240\tif (page == NULL)\n" + "> \302\240\t\treturn ERR_PTR(-EIO);\n" + "> -\tptr = kmap(page);\n" + "> -\tif (ptr == NULL)\n" + "> -\t\treturn ERR_PTR(-ENOMEM);\n" + "> -\treturn ptr;\n" + "> +\treturn kmap(page);\n" + "> \302\240}\n" + "> \302\240\n" + "> \302\240static\n" + "\n" + "There seems little value in having a wrapper to kmap... Can we perhaps\n" + "instead just get rid of both nfs_readdir_get_array and\n" + "nfs_readdir_release_array?\n" + "\n" + "-- \n" + "Trond Myklebust\n" + "Linux NFS client maintainer, PrimaryData\n" + trond.myklebust@primarydata.com -d2f3e295dbe7f3be16ce531af52ee9c8b7502cddbddde64e765e1a5e85b825dc +6ecdfbdfd2f2588156ecac0fc890b5d34b961e6b8ad88bc59d18cea25863e5cb
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.