From patchwork Mon Feb 26 09:45:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 877776 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=icloud.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=icloud.com header.i=@icloud.com header.b="p2NSsn5w"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zqdlf2CFmz9s25 for ; Mon, 26 Feb 2018 21:45:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752481AbeBZKpt (ORCPT ); Mon, 26 Feb 2018 05:45:49 -0500 Received: from mr11p00im-asmtp002.me.com ([17.110.69.253]:27631 "EHLO mr11p00im-asmtp002.me.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752413AbeBZKps (ORCPT ); Mon, 26 Feb 2018 05:45:48 -0500 X-Greylist: delayed 3608 seconds by postgrey-1.27 at vger.kernel.org; Mon, 26 Feb 2018 05:45:48 EST Received: from process-dkim-sign-daemon.mr11p00im-asmtp002.me.com by mr11p00im-asmtp002.me.com (Oracle Communications Messaging Server 8.0.1.2.20170607 64bit (built Jun 7 2017)) id <0P4R001003ZC4P00@mr11p00im-asmtp002.me.com> for linux-ext4@vger.kernel.org; Mon, 26 Feb 2018 09:45:27 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=04042017; t=1519638327; bh=SU83mB+cTveJNEjHmOuLeDdInm/zbj3xGUljujjWNZU=; h=From:To:Subject:Date:Message-id; b=p2NSsn5wjMxb/uNOho9519+71xMAd6aeVGZZmKimpBK5LsRXfYYeDYKbsiK7juakm FhNkQFavcezUTR68I0xj1RdqpVNyCGIzh4M9f0dj/modghwplp8pIrHKkLBQKQ/HPb TqYIooeLTUQRQTBtdTKHMeGRbMRHQWCCQM1oZOUv1b4fwPIkCcvZilMQZk7Z9jn9j7 DMFyug5WW3V3xCgTQF069kyglmXFJWY/gc9c+UuCvjOqsM8PRI9rkGy1pmiEjjBufW CUnrsfzN7cM5kF2zhZLvpPqcPrno0T0Km0jXJWrNEXq08XB/1BRhrHQ0ULk+4z/M6y Sj2/9DjwtYg3A== Received: from icloud.com ([127.0.0.1]) by mr11p00im-asmtp002.me.com (Oracle Communications Messaging Server 8.0.1.2.20170607 64bit (built Jun 7 2017)) with ESMTPSA id <0P4R00D8R4FEU730@mr11p00im-asmtp002.me.com>; Mon, 26 Feb 2018 09:45:24 +0000 (GMT) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-26_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 clxscore=1011 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1802260134 From: Chengguang Xu To: jack@suse.cz Cc: linux-ext4@vger.kernel.org, Chengguang Xu Subject: [PATCH] ext2: change return code to -ENOMEM when failing memory allocation Date: Mon, 26 Feb 2018 17:45:12 +0800 Message-id: <1519638312-196606-1-git-send-email-cgxu519@icloud.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Change return code to -ENOMEM from -EINVAL when failing memory allocation in fill_super(), meanwhile delete redundant initial assignment of variable err. Signed-off-by: Chengguang Xu --- fs/ext2/super.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 1dd62ed..15f26d2 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -756,14 +756,13 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) unsigned long logic_sb_block; unsigned long offset = 0; unsigned long def_mount_opts; - long ret = -EINVAL; + long ret = -ENOMEM; int blocksize = BLOCK_SIZE; int db_count; int i, j; __le32 features; int err; - err = -ENOMEM; sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) goto failed_unlock; @@ -778,6 +777,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) sbi->s_sb_block = sb_block; spin_lock_init(&sbi->s_lock); + ret = -EINVAL; /* * See what the current blocksize for the device is, and