Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936368AbcKXJLv (ORCPT ); Thu, 24 Nov 2016 04:11:51 -0500 Received: from mx2.suse.de ([195.135.220.15]:54752 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933657AbcKXJLt (ORCPT ); Thu, 24 Nov 2016 04:11:49 -0500 Date: Thu, 24 Nov 2016 10:11:40 +0100 From: Jan Kara To: Ross Zwisler Cc: linux-kernel@vger.kernel.org, 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@ml01.01.org Subject: Re: [PATCH 2/6] dax: remove leading space from labels Message-ID: <20161124091140.GB24138@quack2.suse.cz> References: <1479926662-21718-1-git-send-email-ross.zwisler@linux.intel.com> <1479926662-21718-3-git-send-email-ross.zwisler@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1479926662-21718-3-git-send-email-ross.zwisler@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3531 Lines: 120 On Wed 23-11-16 11:44:18, Ross Zwisler wrote: > 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. Fine by me. I just have some 4 remaining DAX patches (will send them out today) and they will clash with this. So I'd prefer if this happened after they are merged... Honza > > 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); > -- > 2.7.4 > -- Jan Kara SUSE Labs, CR