From patchwork Wed Nov 30 23:45:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 9455113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB43460756 for ; Wed, 30 Nov 2016 23:45:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE78E284B7 for ; Wed, 30 Nov 2016 23:45:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B31B0284BC; Wed, 30 Nov 2016 23:45:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3AE30284B7 for ; Wed, 30 Nov 2016 23:45:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1BB5F81EFF; Wed, 30 Nov 2016 15:45:56 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7D22D81EFA for ; Wed, 30 Nov 2016 15:45:55 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP; 30 Nov 2016 15:45:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,723,1473145200"; d="scan'208";a="37567783" Received: from theros.lm.intel.com ([10.232.112.77]) by fmsmga005.fm.intel.com with ESMTP; 30 Nov 2016 15:45:54 -0800 From: Ross Zwisler To: linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] dax: remove leading space from labels Date: Wed, 30 Nov 2016 16:45:29 -0700 Message-Id: <1480549533-29038-3-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480549533-29038-1-git-send-email-ross.zwisler@linux.intel.com> References: <1480549533-29038-1-git-send-email-ross.zwisler@linux.intel.com> X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Kara , Andrew Morton , Matthew Wilcox , linux-nvdimm@lists.01.org, Dave Chinner , Steven Rostedt , Christoph Hellwig , linux-mm@kvack.org, Ingo Molnar , Alexander Viro , linux-fsdevel@vger.kernel.org MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. As of this commit: commit 218dd85887da (".gitattributes: set git diff driver for C source code files") git-diff and git-format-patch both generate diffs whose hunks are correctly prefixed by function names instead of labels, even if those labels aren't indented with spaces. Signed-off-by: Ross Zwisler --- fs/dax.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index be39633..b14335c 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -422,7 +422,7 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, return page; } entry = lock_slot(mapping, slot); - out_unlock: +out_unlock: spin_unlock_irq(&mapping->tree_lock); return entry; } @@ -557,7 +557,7 @@ static int dax_load_hole(struct address_space *mapping, void **entry, vmf->gfp_mask | __GFP_ZERO); if (!page) return VM_FAULT_OOM; - out: +out: vmf->page = page; ret = finish_fault(vmf); vmf->page = NULL; @@ -659,7 +659,7 @@ static void *dax_insert_mapping_entry(struct address_space *mapping, } if (vmf->flags & FAULT_FLAG_WRITE) radix_tree_tag_set(page_tree, index, PAGECACHE_TAG_DIRTY); - unlock: +unlock: spin_unlock_irq(&mapping->tree_lock); if (hole_fill) { radix_tree_preload_end(); @@ -812,12 +812,12 @@ static int dax_writeback_one(struct block_device *bdev, spin_lock_irq(&mapping->tree_lock); radix_tree_tag_clear(page_tree, index, PAGECACHE_TAG_DIRTY); spin_unlock_irq(&mapping->tree_lock); - unmap: +unmap: dax_unmap_atomic(bdev, &dax); put_locked_mapping_entry(mapping, index, entry); return ret; - put_unlocked: +put_unlocked: put_unlocked_mapping_entry(mapping, index, entry2); spin_unlock_irq(&mapping->tree_lock); return ret; @@ -1194,11 +1194,11 @@ int dax_iomap_fault(struct vm_area_struct *vma, struct vm_fault *vmf, break; } - error_unlock_entry: +error_unlock_entry: vmf_ret = dax_fault_return(error) | major; - unlock_entry: +unlock_entry: put_locked_mapping_entry(mapping, vmf->pgoff, entry); - finish_iomap: +finish_iomap: if (ops->iomap_end) { int copied = PAGE_SIZE; @@ -1255,7 +1255,7 @@ static int dax_pmd_insert_mapping(struct vm_area_struct *vma, pmd_t *pmd, return vmf_insert_pfn_pmd(vma, address, pmd, dax.pfn, write); - unmap_fallback: +unmap_fallback: dax_unmap_atomic(bdev, &dax); return VM_FAULT_FALLBACK; } @@ -1379,9 +1379,9 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, break; } - unlock_entry: +unlock_entry: put_locked_mapping_entry(mapping, pgoff, entry); - finish_iomap: +finish_iomap: if (ops->iomap_end) { int copied = PMD_SIZE; @@ -1396,7 +1396,7 @@ int dax_iomap_pmd_fault(struct vm_area_struct *vma, unsigned long address, ops->iomap_end(inode, pos, PMD_SIZE, copied, iomap_flags, &iomap); } - fallback: +fallback: if (result == VM_FAULT_FALLBACK) { split_huge_pmd(vma, pmd, address); count_vm_event(THP_FAULT_FALLBACK);