On Wed, Jan 31, 2018 at 10:53 AM, Nikolay Borisov <nborisov@xxxxxxxx> wrote:
>
>
> On 31.01.2018 12:49, Filipe Manana wrote:
>> On Tue, Jan 30, 2018 at 2:32 PM, Nikolay Borisov <nborisov@xxxxxxxx> wrote:
>>> Essentially duplicate the error handling from the above block which
>>> handles the !PageUptodate(page) case and additionally clear
>>> EXTENT_BOUNDARY.
>>>
>>> Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx>
>>> Reviewed-by: Josef Bacik <jbacik@xxxxxx>
>>> ---
>>>
>>> Put description of the intended changes.
>>>
>>> fs/btrfs/relocation.c | 21 +++++++++++++++++----
>>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
>>> index f0c3f00e97cb..8b2a31cef5cf 100644
>>> --- a/fs/btrfs/relocation.c
>>> +++ b/fs/btrfs/relocation.c
>>> @@ -3268,12 +3268,25 @@ static int relocate_file_extent_cluster(struct inode *inode,
>>> nr++;
>>> }
>>>
>>> - btrfs_set_extent_delalloc(inode, page_start, page_end, 0, NULL,
>>> - 0);
>>> + ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0,
>>> + NULL, 0);
>>> + if (ret) {
>>> + unlock_page(page);
>>> + put_page(page);
>>> + btrfs_delalloc_release_metadata(BTRFS_I(inode),
>>> + PAGE_SIZE);
>>> + btrfs_delalloc_release_extents(BTRFS_I(inode),
>>> + PAGE_SIZE);
>>> +
>>> + clear_extent_bits(&BTRFS_I(inode)->io_tree,
>>> + page_start, page_end,
>>> + EXTENT_LOCKED | EXTENT_BOUNDARY);
>>> + goto out;
>>> +
>>> + }
>>> set_page_dirty(page);
>>>
>>> - unlock_extent(&BTRFS_I(inode)->io_tree,
>>> - page_start, page_end);
>>> + unlock_extent(&BTRFS_I(inode)->io_tree, page_start, page_end);
>>
>> This is an unrelated change. Please don't mix pure white
>> space/indentation changes with functional changes.
>
> David seems rather adamant in not accepting pure whitespace/indention
Well, for every project I worked on, either open source or not this
was always frowned upon.
And it's quite obvious why...
> changes on their own so I don't see a way to actually improve the code
> base in that regard unless i slip them up when modifying nearby code.
> There are a couple of space with trailing whitespace which I constantly
> select out from my commits.
>
> Given that you have now also expressed objection to such cleanups, how
> should they eventually be fixed?
You "fix" them by doing a functional change affecting that code.
If you know it's frowned upon, please don't keep sneaking this sort of changes,
>
>>
>>> unlock_page(page);
>>> put_page(page);
>>>
>>> --
>>> 2.7.4
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
>>> the body of a message to majordomo@xxxxxxxxxxxxxxx
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
>>
--
Filipe David Manana,
“Whether you think you can, or you think you can't — you're right.”
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
