From patchwork Sun Nov 10 11:39:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Valentina Giusti X-Patchwork-Id: 3165151 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B58E09F39E for ; Sun, 10 Nov 2013 11:42:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D382320126 for ; Sun, 10 Nov 2013 11:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B37D200E9 for ; Sun, 10 Nov 2013 11:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751297Ab3KJLmM (ORCPT ); Sun, 10 Nov 2013 06:42:12 -0500 Received: from mail.microon.de ([37.252.125.21]:48904 "EHLO gattino.microon.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751206Ab3KJLmL (ORCPT ); Sun, 10 Nov 2013 06:42:11 -0500 Received: from tindwyl.labs.pbs.com (ulmg-5d847bc1.pool.mediaWays.net [93.132.123.193]) by gattino.microon.de (Postfix) with ESMTPSA id 847AA42253; Sun, 10 Nov 2013 12:42:08 +0100 (CET) From: Valentina Giusti To: chris.mason@fusionio.com Cc: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs: remove unused parameters from wait_for_commit and btrfs_wait_marked_extents Date: Sun, 10 Nov 2013 12:39:32 +0100 Message-Id: <1384083572-15443-1-git-send-email-valentina.giusti@microon.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the following warnings: fs/btrfs/transaction.c: In function ‘wait_for_commit’: fs/btrfs/transaction.c:560:57: warning: unused parameter ‘root’ [-Wunused-parameter] fs/btrfs/transaction.c: In function ‘btrfs_wait_marked_extents’: fs/btrfs/transaction.c:811:50: warning: unused parameter ‘mark’ [-Wunused-parameter] Signed-off-by: Valentina Giusti --- fs/btrfs/transaction.c | 13 ++++++------- fs/btrfs/transaction.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 8c81bdc..f555231 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -557,8 +557,7 @@ btrfs_attach_transaction_barrier(struct btrfs_root *root) } /* wait for a transaction commit to be fully complete */ -static noinline void wait_for_commit(struct btrfs_root *root, - struct btrfs_transaction *commit) +static noinline void wait_for_commit(struct btrfs_transaction *commit) { wait_event(commit->commit_wait, commit->state == TRANS_STATE_COMPLETED); } @@ -609,7 +608,7 @@ int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid) goto out; /* nothing committing|committed */ } - wait_for_commit(root, cur_trans); + wait_for_commit(cur_trans); put_transaction(cur_trans); out: return ret; @@ -808,7 +807,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root, * on all the pages and clear them from the dirty pages state tree */ int btrfs_wait_marked_extents(struct btrfs_root *root, - struct extent_io_tree *dirty_pages, int mark) + struct extent_io_tree *dirty_pages) { int err = 0; int werr = 0; @@ -847,7 +846,7 @@ static int btrfs_write_and_wait_marked_extents(struct btrfs_root *root, blk_start_plug(&plug); ret = btrfs_write_marked_extents(root, dirty_pages, mark); blk_finish_plug(&plug); - ret2 = btrfs_wait_marked_extents(root, dirty_pages, mark); + ret2 = btrfs_wait_marked_extents(root, dirty_pages); if (ret) return ret; @@ -1667,7 +1666,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, atomic_inc(&cur_trans->use_count); ret = btrfs_end_transaction(trans, root); - wait_for_commit(root, cur_trans); + wait_for_commit(cur_trans); put_transaction(cur_trans); @@ -1684,7 +1683,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, atomic_inc(&prev_trans->use_count); spin_unlock(&root->fs_info->trans_lock); - wait_for_commit(root, prev_trans); + wait_for_commit(prev_trans); put_transaction(prev_trans); } else { diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index 5c2af84..f16ab19 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h @@ -163,7 +163,7 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans, int btrfs_write_marked_extents(struct btrfs_root *root, struct extent_io_tree *dirty_pages, int mark); int btrfs_wait_marked_extents(struct btrfs_root *root, - struct extent_io_tree *dirty_pages, int mark); + struct extent_io_tree *dirty_pages); int btrfs_transaction_blocked(struct btrfs_fs_info *info); int btrfs_transaction_in_commit(struct btrfs_fs_info *info); #endif