2017-04-26 18:45:27

by Fabian Frédérick

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

Remove NULL test on kmap()

Signed-off-by: Fabian Frederick <[email protected]>
---
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

2017-04-26 19:05:17

by Trond Myklebust

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

On Wed, 2017-04-26 at 20:45 +0200, Fabian Frederick wrote:
> Remove NULL test on kmap()
>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> 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
[email protected]