| Message ID | 1479926662-21718-3-git-send-email-ross.zwisler@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <ross.zwisler@linux.intel.com> > --- > 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 >
On Thu, Nov 24, 2016 at 1:11 AM, Jan Kara <jack@suse.cz> wrote: > 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... Let's just leave them alone, it's not like this thrash buys us anything at this point. We can just stop including spaces in new code.
On Thu, Nov 24, 2016 at 11:42:38AM -0800, Dan Williams wrote: > On Thu, Nov 24, 2016 at 1:11 AM, Jan Kara <jack@suse.cz> wrote: > > 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... > > Let's just leave them alone, it's not like this thrash buys us > anything at this point. We can just stop including spaces in new > code. Honestly I'm not sure which is better. I understand your argument about not introducing "thrash" for cleanup like this, but at the same time knowingly leaving inconsistencies in the code style just because seems...gross? In any case, sure Jan, if this patch happens lets do it after your remaining DAX patches.
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);
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 <ross.zwisler@linux.intel.com> --- fs/dax.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)