From patchwork Wed Nov 23 18:44:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 9444119 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 C73EC60235 for ; Wed, 23 Nov 2016 18:46:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9129276D7 for ; Wed, 23 Nov 2016 18:46:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD8D027C14; Wed, 23 Nov 2016 18:46:12 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ED49276D7 for ; Wed, 23 Nov 2016 18:46:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933909AbcKWSpK (ORCPT ); Wed, 23 Nov 2016 13:45:10 -0500 Received: from mga09.intel.com ([134.134.136.24]:4058 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933817AbcKWSpI (ORCPT ); Wed, 23 Nov 2016 13:45:08 -0500 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 23 Nov 2016 10:45:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,539,1473145200"; d="scan'208";a="904841835" Received: from rzwisler-desk1.amr.corp.intel.com (HELO tarkir.intel.com) ([10.255.3.143]) by orsmga003.jf.intel.com with ESMTP; 23 Nov 2016 10:45:06 -0800 From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ross Zwisler , Alexander Viro , Andrew Morton , Christoph Hellwig , Dan Williams , Dave Chinner , Ingo Molnar , Jan Kara , Matthew Wilcox , Steven Rostedt , linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-nvdimm@lists.01.org Subject: [PATCH 2/6] dax: remove leading space from labels Date: Wed, 23 Nov 2016 11:44:18 -0700 Message-Id: <1479926662-21718-3-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479926662-21718-1-git-send-email-ross.zwisler@linux.intel.com> References: <1479926662-21718-1-git-send-email-ross.zwisler@linux.intel.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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 d8fe3eb..cc8a069 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; @@ -1193,11 +1193,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; @@ -1254,7 +1254,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; } @@ -1378,9 +1378,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; @@ -1395,7 +1395,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);