From patchwork Thu Nov 12 22:27:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Moise <00moses.alexander00@gmail.com> X-Patchwork-Id: 543722 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 22F4014142A for ; Fri, 13 Nov 2015 09:29:38 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pb4snBcb; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754315AbbKLW2G (ORCPT ); Thu, 12 Nov 2015 17:28:06 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37226 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753975AbbKLW2E (ORCPT ); Thu, 12 Nov 2015 17:28:04 -0500 Received: by wmww144 with SMTP id w144so6854489wmw.0; Thu, 12 Nov 2015 14:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=ut8/7Vx7UYJjIVOe6QVhrs5HmUXx41kji7V/0E+eQCg=; b=pb4snBcbO3pMFfTnIQM+aEatGgivbBDFioCtsUX+46Kv6Fmg5qxVQxhBbep2OAP6rF tBsS9KGrnA+t+omXQ1j2nEzOU+DOjI/k4IRiFMHMN9VlwzJfSCeuuf0eDdvWhsrmnZs+ 6ai1SYfp9hWtFqXskx8eSxmt0UkvwaPKcmW/PwukjWi7oH9yqcrZOaw7LL2ifYNT6zNO ycpZx+XsQDYIx7BIFeXfrG+8iTEAkCd0cC3jOV1dWVFqR2SLmHjoi9vLdOEGpULrFqcZ P+eGtm+uP1q3A7WdUA77a1bWUUKmk6tP1W0aYhk9Sz4757ptVm1BTKC9oTg1vIeGfTVp TwFQ== X-Received: by 10.194.188.112 with SMTP id fz16mr18382664wjc.65.1447367282372; Thu, 12 Nov 2015 14:28:02 -0800 (PST) Received: from gmail.com ([188.24.213.1]) by smtp.gmail.com with ESMTPSA id vr10sm16688339wjc.38.2015.11.12.14.28.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2015 14:28:01 -0800 (PST) Date: Fri, 13 Nov 2015 00:27:56 +0200 From: Alexandru Moise <00moses.alexander00@gmail.com> To: tytso@mit.edu Cc: jack@suse.com, linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] jbd2: redefine jbd2_get_transaction to jbd2_init_transaction Message-ID: <20151112222756.GA668@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch follows the same logic of a 2012 patch to jbd (prior to ext3 removal). Yuanhan Liu renamed the jbd get_transaction() function to init_transaction(), as the function was as an initialization function, as it is mostly in our case. Also remove the return value as it is unused. Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com> Reviewed-by: Jan Kara --- fs/jbd2/transaction.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 89463ee..3fd597b 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -65,7 +65,7 @@ void jbd2_journal_free_transaction(transaction_t *transaction) } /* - * jbd2_get_transaction: obtain a new transaction_t object. + * jbd2_init_transaction: obtain a new transaction_t object. * * Simply allocate and initialise a new transaction. Create it in * RUNNING state and add it to the current journal (which should not @@ -79,8 +79,8 @@ void jbd2_journal_free_transaction(transaction_t *transaction) * */ -static transaction_t * -jbd2_get_transaction(journal_t *journal, transaction_t *transaction) +static void +jbd2_init_transaction(journal_t *journal, transaction_t *transaction) { transaction->t_journal = journal; transaction->t_state = T_RUNNING; @@ -104,8 +104,6 @@ jbd2_get_transaction(journal_t *journal, transaction_t *transaction) transaction->t_max_wait = 0; transaction->t_start = jiffies; transaction->t_requested = 0; - - return transaction; } /* @@ -343,7 +341,7 @@ repeat: write_lock(&journal->j_state_lock); if (!journal->j_running_transaction && (handle->h_reserved || !journal->j_barrier_count)) { - jbd2_get_transaction(journal, new_transaction); + jbd2_init_transaction(journal, new_transaction); new_transaction = NULL; } write_unlock(&journal->j_state_lock);