From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753881AbcBENui (ORCPT ); Fri, 5 Feb 2016 08:50:38 -0500 Received: from m12-15.163.com ([220.181.12.15]:45169 "EHLO m12-15.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753801AbcBENug (ORCPT ); Fri, 5 Feb 2016 08:50:36 -0500 From: weiyj_lk@163.com To: Markus Pargmann , Jens Axboe Cc: Wei Yongjun , nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH] nbd: Fix return value check for debugfs_create_*() Date: Fri, 5 Feb 2016 21:48:21 +0800 Message-Id: <1454680101-17853-1-git-send-email-weiyj_lk@163.com> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-CM-TRANSID: D8CowEAJL0EkqLRW5BxdAA--.18808S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxArWkKFW8uF18Aw4xtF18Xwb_yoW5CF18pa n3AF45KrW0krnrAr93Z3ZrCw1rA34vqw18GrW7W3WSvryfZr43ua48JFWFqFW2gFyFqFn8 uan8Aa4DC3WUurJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jXpnPUUUUU= X-Originating-IP: [49.77.206.103] X-CM-SenderInfo: pzhl5yxbonqiywtou0bp/xtbBDQgG1laDlKGfnAAAs2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun In case of error, the function debugfs_create_*() returns NULL pointer not ERR_PTR() if debugfs is enabled. The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun --- drivers/block/nbd.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index e4c5cc1..02bc697 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -895,49 +895,47 @@ static int nbd_dev_dbg_init(struct nbd_device *nbd) struct dentry *f; dir = debugfs_create_dir(nbd_name(nbd), nbd_dbg_dir); - if (IS_ERR_OR_NULL(dir)) { - dev_err(nbd_to_dev(nbd), "Failed to create debugfs dir for '%s' (%ld)\n", - nbd_name(nbd), PTR_ERR(dir)); - return PTR_ERR(dir); + if (!dir) { + dev_err(nbd_to_dev(nbd), "Failed to create debugfs dir for '%s'\n", + nbd_name(nbd)); + return -ENOMEM; } nbd->dbg_dir = dir; f = debugfs_create_file("tasks", 0444, dir, nbd, &nbd_dbg_tasks_ops); - if (IS_ERR_OR_NULL(f)) { - dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'tasks', %ld\n", - PTR_ERR(f)); - return PTR_ERR(f); + if (!f) { + dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'tasks'\n"); + goto fail; } f = debugfs_create_u64("size_bytes", 0444, dir, &nbd->bytesize); - if (IS_ERR_OR_NULL(f)) { - dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'size_bytes', %ld\n", - PTR_ERR(f)); - return PTR_ERR(f); + if (!f) { + dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'size_bytes'\n"); + goto fail; } f = debugfs_create_u32("timeout", 0444, dir, &nbd->xmit_timeout); - if (IS_ERR_OR_NULL(f)) { - dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'timeout', %ld\n", - PTR_ERR(f)); - return PTR_ERR(f); + if (!f) { + dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'timeout'\n"); + goto fail; } f = debugfs_create_u32("blocksize", 0444, dir, &nbd->blksize); - if (IS_ERR_OR_NULL(f)) { - dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'blocksize', %ld\n", - PTR_ERR(f)); - return PTR_ERR(f); + if (!f) { + dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'blocksize'\n"); + goto fail; } f = debugfs_create_file("flags", 0444, dir, &nbd, &nbd_dbg_flags_ops); - if (IS_ERR_OR_NULL(f)) { - dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'flags', %ld\n", - PTR_ERR(f)); - return PTR_ERR(f); + if (!f) { + dev_err(nbd_to_dev(nbd), "Failed to create debugfs file 'flags'\n"); + goto fail; } return 0; +fail: + debugfs_remove_recursive(nbd->dbg_dir); + return -ENOMEM; } static void nbd_dev_dbg_close(struct nbd_device *nbd) @@ -950,8 +948,8 @@ static int nbd_dbg_init(void) struct dentry *dbg_dir; dbg_dir = debugfs_create_dir("nbd", NULL); - if (IS_ERR(dbg_dir)) - return PTR_ERR(dbg_dir); + if (!dbg_dir) + return -ENOMEM; nbd_dbg_dir = dbg_dir;