Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965726AbdDZTFR (ORCPT ); Wed, 26 Apr 2017 15:05:17 -0400 Received: from us-smtp-delivery-194.mimecast.com ([63.128.21.194]:31779 "EHLO us-smtp-delivery-194.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965686AbdDZTFJ (ORCPT ); Wed, 26 Apr 2017 15:05:09 -0400 From: Trond Myklebust To: "anna.schumaker@netapp.com" , Trond Myklebust , "fabf@skynet.be" CC: "linux-kernel@vger.kernel.org" , "linux-nfs@vger.kernel.org" Subject: Re: [PATCH V2 linux-next] nfs: kmap can't fail Thread-Topic: [PATCH V2 linux-next] nfs: kmap can't fail Thread-Index: AQHSvr1FEcxlBCPgQ06Yvhuv3DNty6HYAoWA Date: Wed, 26 Apr 2017 19:05:02 +0000 Message-ID: <1493233499.2326.1.camel@primarydata.com> References: <20170426184516.21784-1-fabf@skynet.be> In-Reply-To: <20170426184516.21784-1-fabf@skynet.be> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [50.108.104.212] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MWHPR11MB1359;7:Nb3r38Q5Tssp3XiOp/fAAwslhvoqx6y616gdXwm1QRAB+QXeBlq8zE6QRyN/p1+0876mj3vG5IIMLnUVPXHDQh3/PGNXhQxF8s3o6tsOfSFqiqizuuTed6algH0a3SNQ3bj75JIJ+Cz+R0/3qK9Iq6sX+OkpGT5M4rpnlMFWP45poBVvjK4r1tEAnSYIVTLaCZOnnDTi/8LKYajPWtwTmEc/bWOU9/ba4dZ/sIpmfQufKG6D/zInz1vx9Eotc/1nzcYTYAu2UWbyLIjNRV+gmVpXPyPhu5hP3xMT0lnh5SaOTwLx/NHdYB0CgYu2DOg8+yPnWq34r3i4S9UtSPE9iQ==;20:/+adDSeIMM2IdelGgzFrExf9KjUrjoC4Siq9vzCMx/KxkEtGE6sbIB3l1hWZA0IvCuM44QVj4ierZlpmPN3R6vq6NakbzrbARYbhU1SBqkLyfxfRyweh2IePK2fznjtdL1erTc4C/3aNmk/9zhLkfTUAwUsQTPP6qEN7pUsQbqo= x-forefront-antispam-report: SFV:SKI;SCL:-1SFV:NSPM;SFS:(10019020)(6009001)(39400400002)(39410400002)(39450400003)(377424004)(24454002)(305945005)(8676002)(81166006)(102836003)(36756003)(2501003)(7736002)(3846002)(8936002)(86362001)(25786009)(6116002)(6246003)(3660700001)(122556002)(38730400002)(2906002)(99286003)(6512007)(3280700002)(6436002)(54906002)(53936002)(189998001)(6486002)(6506006)(77096006)(2900100001)(103116003)(2950100002)(76176999)(4326008)(50986999)(54356999)(33646002)(66066001)(229853002);DIR:OUT;SFP:1102;SCL:1;SRVR:MWHPR11MB1359;H:MWHPR11MB1359.namprd11.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; x-ms-office365-filtering-correlation-id: ffe89423-2055-44a5-d180-08d48cd72482 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254075)(201703131423075)(201702281549075);SRVR:MWHPR11MB1359; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(235404470278024); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123555025)(2016111802025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123558100)(6043046)(6072148);SRVR:MWHPR11MB1359;BCL:0;PCL:0;RULEID:;SRVR:MWHPR11MB1359; x-forefront-prvs: 0289B6431E spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <0BA4C1E27BB71B44AD48FB244D874E7E@namprd11.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: primarydata.com X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2017 19:05:02.2931 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 03193ed6-8726-4bb3-a832-18ab0d28adb7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1359 X-MC-Unique: 0U1hd05sP1KXKPsjwc9z7w-1 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id v3QJ5Su1000428 Content-Length: 1005 Lines: 39 On Wed, 2017-04-26 at 20:45 +0200, Fabian Frederick wrote: > Remove NULL test on kmap() > > Signed-off-by: Fabian Frederick > --- > 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