From patchwork Sun Feb 21 23:02:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Loctaux X-Patchwork-Id: 8369601 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 693779F314 for ; Sun, 21 Feb 2016 23:04:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 502A4201DD for ; Sun, 21 Feb 2016 23:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35E3E201C7 for ; Sun, 21 Feb 2016 23:04:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752427AbcBUXDH (ORCPT ); Sun, 21 Feb 2016 18:03:07 -0500 Received: from 17.mo4.mail-out.ovh.net ([46.105.41.16]:41631 "EHLO 17.mo4.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbcBUXDG (ORCPT ); Sun, 21 Feb 2016 18:03:06 -0500 Received: from mail178.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo4.mail-out.ovh.net (Postfix) with SMTP id 9A14A10F40ED for ; Mon, 22 Feb 2016 00:03:00 +0100 (CET) Received: from localhost (HELO queueout) (127.0.0.1) by localhost with SMTP; 22 Feb 2016 01:03:00 +0200 Received: from lfbn-1-1342-12.w86-253.abo.wanadoo.fr (HELO localhost) (phil@philippeloctaux.com@86.253.201.12) by ns0.ovh.net with AES128-GCM-SHA256 encrypted SMTP; 22 Feb 2016 01:02:58 +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] Btrfs: check-integrity: fixed comment blocks coding style issues Date: Mon, 22 Feb 2016 00:02:47 +0100 Message-Id: <1456095767-1561-1-git-send-email-phil@philippeloctaux.com> X-Mailer: git-send-email 2.7.1 X-Ovh-Tracer-Id: 4765371357262419219 X-Ovh-Remote: 86.253.201.12 (lfbn-1-1342-12.w86-253.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: 0 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekjedrheefucetufdoteggodftvfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecu X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekjedrheefgdduieejucetufdoteggodftvfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecu 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 Makes the comment blocks start with /* on separate lines, and end with */ on separate lines as well. Signed-off-by: Philippe Loctaux --- fs/btrfs/check-integrity.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 861d472..cb5dc04 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -2070,8 +2070,11 @@ again: goto continue_loop; } - /* this is getting ugly for the - * include_extent_data case... */ + /* + * this is getting ugly for the + * include_extent_data case... + */ + bytenr = 0; /* unknown */ } else { processed_len = state->metablock_size; @@ -2180,8 +2183,11 @@ static void btrfsic_bio_end_io(struct bio *bp) struct btrfsic_block *block = (struct btrfsic_block *)bp->bi_private; int iodone_w_error; - /* mutex is not held! This is not save if IO is not yet completed - * on umount */ + /* + * mutex is not held! This is not save if IO is not yet completed + * on umount + */ + iodone_w_error = 0; if (bp->bi_error) iodone_w_error = 1; @@ -2861,8 +2867,12 @@ int btrfsic_submit_bh(int rw, struct buffer_head *bh) return submit_bh(rw, bh); mutex_lock(&btrfsic_mutex); - /* since btrfsic_submit_bh() might also be called before - * btrfsic_mount(), this might return NULL */ + + /* + * since btrfsic_submit_bh() might also be called before + * btrfsic_mount(), this might return NULL + */ + dev_state = btrfsic_dev_state_lookup(bh->b_bdev); /* Only called to write the superblock (incl. FLUSH/FUA) */ @@ -2924,8 +2934,12 @@ static void __btrfsic_submit_bio(int rw, struct bio *bio) return; mutex_lock(&btrfsic_mutex); - /* since btrfsic_submit_bio() is also called before - * btrfsic_mount(), this might return NULL */ + + /* + * since btrfsic_submit_bio() is also called before + * btrfsic_mount(), this might return NULL + */ + dev_state = btrfsic_dev_state_lookup(bio->bi_bdev); if (NULL != dev_state && (rw & WRITE) && NULL != bio->bi_io_vec) {