From patchwork Mon Feb 22 10:18:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Loctaux X-Patchwork-Id: 8374931 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3A485C0553 for ; Mon, 22 Feb 2016 10:20:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 61D302038A for ; Mon, 22 Feb 2016 10:20:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D5032035D for ; Mon, 22 Feb 2016 10:20:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754226AbcBVKSQ (ORCPT ); Mon, 22 Feb 2016 05:18:16 -0500 Received: from 19.mo1.mail-out.ovh.net ([178.32.97.206]:37535 "EHLO 19.mo1.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221AbcBVKSP (ORCPT ); Mon, 22 Feb 2016 05:18:15 -0500 Received: from mail690.ha.ovh.net (b6.ovh.net [213.186.33.56]) by mo1.mail-out.ovh.net (Postfix) with SMTP id B2833FFBDC3 for ; Mon, 22 Feb 2016 11:18:13 +0100 (CET) Received: from localhost (HELO queueout) (127.0.0.1) by localhost with SMTP; 22 Feb 2016 12:18:13 +0200 Received: from lstlambert-656-1-187-17.w80-14.abo.wanadoo.fr (HELO localhost) (phil@philippeloctaux.com@80.14.13.17) by ns0.ovh.net with AES128-GCM-SHA256 encrypted SMTP; 22 Feb 2016 12:18:12 +0200 From: Philippe Loctaux To: clm@fb.com Cc: jbacik@fb.com, dsterba@suse.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Loctaux Subject: [PATCH 1/3] Btrfs: disk-io: fixed a brace coding style issue Date: Mon, 22 Feb 2016 11:18:06 +0100 Message-Id: <1456136288-4718-1-git-send-email-phil@philippeloctaux.com> X-Mailer: git-send-email 2.7.1 X-Ovh-Tracer-Id: 16169048563483383059 X-Ovh-Remote: 80.14.13.17 (lstlambert-656-1-187-17.w80-14.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: 0 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekjedrheegucetufdoteggodftvfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecu X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekjedrheeggddufecutefuodetggdotffvucfrrhhofhhilhgvmecuqfggjfenuceurghilhhouhhtmecufedttdenuc 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 Fixed a coding style issue. Signed-off-by: Philippe Loctaux --- fs/btrfs/disk-io.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 4545e2e..84cbf16 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1908,11 +1908,11 @@ static int transaction_kthread(void *arg) cannot_commit = true; goto sleep; } - if (transid == trans->transid) { + if (transid == trans->transid) btrfs_commit_transaction(trans, root); - } else { + else btrfs_end_transaction(trans, root); - } + sleep: wake_up_process(root->fs_info->cleaner_kthread); mutex_unlock(&root->fs_info->transaction_kthread_mutex); @@ -1978,11 +1978,11 @@ static void find_oldest_super_backup(struct btrfs_fs_info *info, newest_index = find_newest_super_backup(info, newest_gen); /* if there was garbage in there, just move along */ - if (newest_index == -1) { + if (newest_index == -1) info->backup_root_index = 0; - } else { + else info->backup_root_index = (newest_index + 1) % BTRFS_NUM_BACKUP_ROOTS; - } + } /*