Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp5278766imd; Tue, 30 Oct 2018 15:01:15 -0700 (PDT) X-Google-Smtp-Source: AJdET5cU5LsHXYlll/cw7dtF5yTd/I+n7T9zHf7uWTKvZSXHcHkgj02h70J71Xjz2m+cTkc/aP7z X-Received: by 2002:a65:4145:: with SMTP id x5-v6mr433762pgp.309.1540936875022; Tue, 30 Oct 2018 15:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540936874; cv=none; d=google.com; s=arc-20160816; b=jHNlXr5AA4fWZlIUGjynHdthEUkaHDfnRFuDDIdYo0fM5yhxXfLIkHeLyVhD2XZ219 AZZs2gowsk3VLC0A2Wb1i+hzGBfGFmQCG8S5KGNCY0MRtpyu3hNdf+YNv/9Tj/fBvN3S qFAokwexRHtjs6mv8mzUR7ZoHckqxJYkPO23cppzglyC9eLzn+yZLrtwXWCZMa3uWiAB wFQFkhpSBsvr4Kq20lhk8U/jmXP4FRQjxdjZRH4Q0BMJt2qFf5ZRRYwdtK+bINYaLPvq jm6h0wLZ+3w03M91X420PelMkgFBG+Sshhxmks2JWjOx0j/lwOLJoqcCw4YqR2cT72Al 1yZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:cc:to:subject:from; bh=GpTqSli5Uayca0hHQ9c24s2bFBdz7IWHsIrZ9ctFPio=; b=rBoREqMkXRY8jZHF0UiXqnfS1L453LXy1WTaZl4g6R9R5TjxRGuh4LkCOVi6QPZHPS m7xBiyLN3MsEpcWfdBS5mXl1OJpaUrFHliH4uS/ymEpNJ03Qn+7g8f6uMt81De9+vyQH hoWSilG4jmDnJwad/KANajJxti12O2fr+XbFiRDa6jM13YyYNGLFTZJ++j6hymwZmuk/ r6Joiq1w1LS1dqILyMCB4BoT0fRlThET2igmotQpxEMgkDQj7HCBl8n9A1WwMgdsui2K Gq46MGM3zKOS7soy725GXrhmDoIldeJzSnItzUuW3/V1r73O5KwLjcZIthtiFPEVRUOX fhlQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z1-v6si23791152plo.59.2018.10.30.15.00.59; Tue, 30 Oct 2018 15:01:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728356AbeJaGyA (ORCPT + 99 others); Wed, 31 Oct 2018 02:54:00 -0400 Received: from relay.sw.ru ([185.231.240.75]:46010 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725743AbeJaGyA (ORCPT ); Wed, 31 Oct 2018 02:54:00 -0400 Received: from [172.16.24.21] by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1gHc2A-0003hJ-KO; Wed, 31 Oct 2018 00:58:46 +0300 From: Vasily Averin Subject: [PATCH v2 10/11] ext4: remove useless brelse call in ext4_xattr_inode_update_ref() To: linux-ext4@vger.kernel.org, Theodore Ts'o Cc: Andreas Dilger , linux-kernel@vger.kernel.org, Tahsin Erdogan References: Message-ID: Date: Wed, 31 Oct 2018 00:58:46 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org brelse(iloc.bh) is useless here, it is always called with iloc.bh = NULL Fixes dec214d00e0d ("ext4: xattr inode deduplication") # 4.13 cc: Tahsin Erdogan Signed-off-by: Vasily Averin --- fs/ext4/xattr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index f36fc5d5b257..dc1aeab06dba 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -1031,10 +1031,8 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode, inode_lock(ea_inode); ret = ext4_reserve_inode_write(handle, ea_inode, &iloc); - if (ret) { - iloc.bh = NULL; + if (ret) goto out; - } ref_count = ext4_xattr_inode_get_ref(ea_inode); ref_count += ref_change; @@ -1080,12 +1078,10 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode, } ret = ext4_mark_iloc_dirty(handle, ea_inode, &iloc); - iloc.bh = NULL; if (ret) ext4_warning_inode(ea_inode, "ext4_mark_iloc_dirty() failed ret=%d", ret); out: - brelse(iloc.bh); inode_unlock(ea_inode); return ret; } -- 2.17.1