Re: [PATCH v2 2/6] dax: remove leading space from labels
On Thu 01-12-16 08:26:19, Ross Zwisler wrote:
> On Thu, Dec 01, 2016 at 09:11:44AM +0100, Jan Kara wrote:
> > On Wed 30-11-16 16:45:29, 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.
> > >
> > > Signed-off-by: Ross Zwisler
> >
> > Didn't we agree do leave this for a bit later?
>
> Sorry, I thought you just asked to not have to edit your "Page invalidation
> fixes" series because of this change. This series is based on a tree that
> already includes your page invalidation work, so it shouldn't cause you any
> thrash.
Ah, I see, I didn't notice. Then it's fine :). Thanks.
Honza
--
Jan Kara
SUSE Labs, CR
Re: [PATCH v2 2/6] dax: remove leading space from labels
On Thu 01-12-16 08:26:19, Ross Zwisler wrote:
> On Thu, Dec 01, 2016 at 09:11:44AM +0100, Jan Kara wrote:
> > On Wed 30-11-16 16:45:29, 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.
> > >
> > > Signed-off-by: Ross Zwisler
> >
> > Didn't we agree do leave this for a bit later?
>
> Sorry, I thought you just asked to not have to edit your "Page invalidation
> fixes" series because of this change. This series is based on a tree that
> already includes your page invalidation work, so it shouldn't cause you any
> thrash.
Ah, I see, I didn't notice. Then it's fine :). Thanks.
Honza
--
Jan Kara
SUSE Labs, CR
Re: [PATCH v2 2/6] dax: remove leading space from labels
On Thu, Dec 01, 2016 at 09:11:44AM +0100, Jan Kara wrote:
> On Wed 30-11-16 16:45:29, 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.
> >
> > Signed-off-by: Ross Zwisler
>
> Didn't we agree do leave this for a bit later?
Sorry, I thought you just asked to not have to edit your "Page invalidation
fixes" series because of this change. This series is based on a tree that
already includes your page invalidation work, so it shouldn't cause you any
thrash.
I'll pull it out of the next version of this series.
Re: [PATCH v2 2/6] dax: remove leading space from labels
On Thu, Dec 01, 2016 at 09:11:44AM +0100, Jan Kara wrote:
> On Wed 30-11-16 16:45:29, 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.
> >
> > Signed-off-by: Ross Zwisler
>
> Didn't we agree do leave this for a bit later?
Sorry, I thought you just asked to not have to edit your "Page invalidation
fixes" series because of this change. This series is based on a tree that
already includes your page invalidation work, so it shouldn't cause you any
thrash.
I'll pull it out of the next version of this series.
Re: [PATCH v2 2/6] dax: remove leading space from labels
On Wed 30-11-16 16:45:29, 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.
>
> Signed-off-by: Ross Zwisler
Didn't we agree do leave this for a bit later?
Honza
> ---
> 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(>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(>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(>tree_lock);
> radix_tree_tag_clear(page_tree, index, PAGECACHE_TAG_DIRTY);
> spin_unlock_irq(>tree_lock);
> - unmap:
> +unmap:
> dax_unmap_atomic(bdev, );
> put_locked_mapping_entry(mapping, index, entry);
> return ret;
>
> - put_unlocked:
> +put_unlocked:
> put_unlocked_mapping_entry(mapping, index, entry2);
> spin_unlock_irq(>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, );
> 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,
> );
> }
> - 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
Re: [PATCH v2 2/6] dax: remove leading space from labels
On Wed 30-11-16 16:45:29, 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.
>
> Signed-off-by: Ross Zwisler
Didn't we agree do leave this for a bit later?
Honza
> ---
> 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(>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(>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(>tree_lock);
> radix_tree_tag_clear(page_tree, index, PAGECACHE_TAG_DIRTY);
> spin_unlock_irq(>tree_lock);
> - unmap:
> +unmap:
> dax_unmap_atomic(bdev, );
> put_locked_mapping_entry(mapping, index, entry);
> return ret;
>
> - put_unlocked:
> +put_unlocked:
> put_unlocked_mapping_entry(mapping, index, entry2);
> spin_unlock_irq(>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, );
> 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,
> );
> }
> - 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
