Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp2619975imm; Sun, 5 Aug 2018 08:15:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdlrhuRqMtbRt54LZfgmZx3hd7/vE66MqB2m1PrAooMi5QkIxtJ+yt30qhYDWIOy+5hETT8 X-Received: by 2002:a62:828a:: with SMTP id w132-v6mr13340116pfd.121.1533482138442; Sun, 05 Aug 2018 08:15:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533482138; cv=none; d=google.com; s=arc-20160816; b=I9l5KfLUuvj0eHjaes1ZERI2k0hWI6Jo5CHtSEs+30O3sCgSlR9/2EyZq9qllGo2yM Y7RjuL0ejTS3Nz3pXZwwJ62IQ0Wdwo3DWQY+CyYVzf9cwSVLrxqXu55sD0Su6KkpMQmP vu95pxaxCm3ncgrWbSi0Gkjl7JcYdJzIC1kscHirEYmSAu94M3qAMOoVcItZbDYGmXOP kstltiWx+a9TJdFcwY/rjq4rJj/W1paap5dBb5JBHUleSUm+e/iBivzKgiLkDbwOkdkr ruxnyMjzUKc9saPPqjYrGiCMt6KlqhMuEN5ozvZLKraCEpsmrXOHNfhDDwvLstrJd3OR d9/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=vBTW6fux8Fj4fpA4ncko8NvXN7j+8prf7QuCdfOeXUk=; b=sePl4g6RG14lYViRjo2rGoLsIsL/zbAbfvPIrPJz1p4yGmhPNCbRFI7BDFeYbC6Men aZR2ytBU/PBZm2TI8Edc3tdCwOzVm0Vefuupx8hOvICIXjMDiXIsRxUDnePu+XXq8WBm K7Mk52KfRY1MKXLDicP0sPG+ACPLc3Y/zSa6sqFhRbyyDeSNNhPtzmRn8KhVKnVTrjSC NrALqfe7zrm4aypmvHqBvtni4hd8YEpv1/7PhRMCNQJaimC+QaS8vOuHjlm9LboRQVZF TmyHwXm7taUg6qenSgHA1ZL5M1AlK9py2NLUbSNVtKzF63SBLhSW8JITXf14itjL3iSF /Yfg== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k18-v6si9940924pgl.364.2018.08.05.08.15.23; Sun, 05 Aug 2018 08:15:38 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726680AbeHERTb (ORCPT + 99 others); Sun, 5 Aug 2018 13:19:31 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:47135 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726243AbeHERTa (ORCPT ); Sun, 5 Aug 2018 13:19:30 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id CABD9F62D33E0; Sun, 5 Aug 2018 23:14:32 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.399.0; Sun, 5 Aug 2018 23:14:31 +0800 From: zhong jiang To: , , CC: , Subject: [PATCH 3/3] fs/btrfs/tree-log: remove the unneeded variable "err" Date: Sun, 5 Aug 2018 23:02:51 +0800 Message-ID: <1533481371-21349-4-git-send-email-zhongjiang@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1533481371-21349-1-git-send-email-zhongjiang@huawei.com> References: <1533481371-21349-1-git-send-email-zhongjiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The err is not used after initalization, So just remove it and make the function to be void function. Signed-off-by: zhong jiang --- fs/btrfs/tree-log.c | 5 +---- fs/btrfs/tree-log.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 1650dc4..4ed7379 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -205,14 +205,11 @@ static int join_running_log_trans(struct btrfs_root *root) * until you call btrfs_end_log_trans() or it makes any future * log transactions wait until you call btrfs_end_log_trans() */ -int btrfs_pin_log_trans(struct btrfs_root *root) +void btrfs_pin_log_trans(struct btrfs_root *root) { - int ret = -ENOENT; - mutex_lock(&root->log_mutex); atomic_inc(&root->log_writers); mutex_unlock(&root->log_mutex); - return ret; } /* diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h index 122e68b..8977678 100644 --- a/fs/btrfs/tree-log.h +++ b/fs/btrfs/tree-log.h @@ -65,7 +65,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, const char *name, int name_len, struct btrfs_inode *inode, u64 dirid); void btrfs_end_log_trans(struct btrfs_root *root); -int btrfs_pin_log_trans(struct btrfs_root *root); +void btrfs_pin_log_trans(struct btrfs_root *root); void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, struct btrfs_inode *dir, struct btrfs_inode *inode, int for_rename); -- 1.7.12.4