Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965310AbdDZSp1 (ORCPT ); Wed, 26 Apr 2017 14:45:27 -0400 Received: from mailrelay109.isp.belgacom.be ([195.238.20.136]:21120 "EHLO mailrelay109.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965256AbdDZSpU (ORCPT ); Wed, 26 Apr 2017 14:45:20 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3A+PKsnBwHIHKi9C3XCy+O+j09IxM/srCxBDY+r6Qd?= =?us-ascii?q?0e8UIJqq85mqBkHD//Il1AaPBtqLra8cw8Pt8IneGkU4qa6bt34DdJEeHzQksu?= =?us-ascii?q?4x2zIaPcieFEfgJ+TrZSFpVO5LVVti4m3peRMNQJW2TxTor3az9T8fHAnkfUow?= =?us-ascii?q?f7ytW92as8Pi6/q1/ZGbRhRLgDe3fKhuZEGqtwLXuo8TkIhmJ6ws0QfhumFJfu?= =?us-ascii?q?1M1G9hOVvVlBH5sIP41Zhl+mxrsPI88sdDXL+yK60+S7UeFz8mLmU858DxnR/O?= =?us-ascii?q?UQKX/j0XVWBAwTRSBA2QwhjwX573+gXgu+ZwwiiRPoWiQ7k+Vxy57LZtRQOugi?= =?us-ascii?q?pRZG1xy33elsEl1PETmxmmvREqhteMOIw=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2BsAwCL6QBZ/zfGs1tcRwYMgkBsgW2Oc?= =?us-ascii?q?ZEBAZVAgg+GHgQChCtAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgxgjgRokARKKDhG?= =?us-ascii?q?tGIQRh0aGVIFejV4FnU6Sfg2Bao90lCcfOIEHRB4YhGEBTxyBZT41hyaBTwEBA?= =?us-ascii?q?Q?= X-IPAS-Result: =?us-ascii?q?A2BsAwCL6QBZ/zfGs1tcRwYMgkBsgW2OcZEBAZVAgg+GHgQ?= =?us-ascii?q?ChCtAGAEBAQEBAQEBAQEBaiiCMwQBHQEEgxgjgRokARKKDhGtGIQRh0aGVIFej?= =?us-ascii?q?V4FnU6Sfg2Bao90lCcfOIEHRB4YhGEBTxyBZT41hyaBTwEBAQ?= From: Fabian Frederick To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH V2 linux-next] nfs: kmap can't fail Date: Wed, 26 Apr 2017 20:45:16 +0200 Message-Id: <20170426184516.21784-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 640 Lines: 31 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 -- 2.9.3