[PATCH V2 linux-next] nfs: kmap can't fail

[PATCH V2 linux-next] nfs: kmap can't fail

[Fabian Frederick]

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
-- 
2.9.3

Re: [PATCH V2 linux-next] nfs: kmap can't fail

[Trond Myklebust]

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

Re: [PATCH V2 linux-next] nfs: kmap can't fail

[Trond Myklebust]

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