linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] btrfs: drop math for block_reserved which is block_rsv size
@ 2020-02-04 11:05 Anand Jain
  2020-02-04 11:10 ` Nikolay Borisov
  0 siblings, 1 reply; 4+ messages in thread
From: Anand Jain @ 2020-02-04 11:05 UTC (permalink / raw)
  To: linux-btrfs

In btrfs_update_global_block_rsv the lines
  num_bytes = block_rsv->size - block_rsv->reserved;
  block_rsv->reserved += num_bytes;
imply
  block_rsv->reserved = block_rsv->size;

Just assign block_rsv->size to block_rsv->reserved instead of the math.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/block-rsv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index 6dacde9a7e93..62e0885c1e5d 100644
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -304,9 +304,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
 
 	if (block_rsv->reserved < block_rsv->size) {
 		num_bytes = block_rsv->size - block_rsv->reserved;
-		block_rsv->reserved += num_bytes;
 		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
 						      num_bytes);
+		block_rsv->reserved = block_rsv->size;
 	} else if (block_rsv->reserved > block_rsv->size) {
 		num_bytes = block_rsv->reserved - block_rsv->size;
 		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] btrfs: drop math for block_reserved which is block_rsv size
  2020-02-04 11:05 [PATCH] btrfs: drop math for block_reserved which is block_rsv size Anand Jain
@ 2020-02-04 11:10 ` Nikolay Borisov
  2020-02-04 12:46   ` Anand Jain
  0 siblings, 1 reply; 4+ messages in thread
From: Nikolay Borisov @ 2020-02-04 11:10 UTC (permalink / raw)
  To: Anand Jain, linux-btrfs



On 4.02.20 г. 13:05 ч., Anand Jain wrote:
> In btrfs_update_global_block_rsv the lines
>   num_bytes = block_rsv->size - block_rsv->reserved;
>   block_rsv->reserved += num_bytes;
> imply
>   block_rsv->reserved = block_rsv->size;
> 
> Just assign block_rsv->size to block_rsv->reserved instead of the math.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
>  fs/btrfs/block-rsv.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
> index 6dacde9a7e93..62e0885c1e5d 100644
> --- a/fs/btrfs/block-rsv.c
> +++ b/fs/btrfs/block-rsv.c
> @@ -304,9 +304,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
>  
>  	if (block_rsv->reserved < block_rsv->size) {
>  		num_bytes = block_rsv->size - block_rsv->reserved;
> -		block_rsv->reserved += num_bytes;
>  		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
>  						      num_bytes);
> +		block_rsv->reserved = block_rsv->size;

Any particular reason why you put the assignment after
btrfs_space_info_update_bytes_may_use and not before?
>  	} else if (block_rsv->reserved > block_rsv->size) {
>  		num_bytes = block_rsv->reserved - block_rsv->size;
>  		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] btrfs: drop math for block_reserved which is block_rsv size
  2020-02-04 11:10 ` Nikolay Borisov
@ 2020-02-04 12:46   ` Anand Jain
  2020-02-24 19:08     ` David Sterba
  0 siblings, 1 reply; 4+ messages in thread
From: Anand Jain @ 2020-02-04 12:46 UTC (permalink / raw)
  To: Nikolay Borisov, linux-btrfs



On 2/4/20 7:10 PM, Nikolay Borisov wrote:
> 
> 
> On 4.02.20 г. 13:05 ч., Anand Jain wrote:
>> In btrfs_update_global_block_rsv the lines
>>    num_bytes = block_rsv->size - block_rsv->reserved;
>>    block_rsv->reserved += num_bytes;
>> imply
>>    block_rsv->reserved = block_rsv->size;
>>
>> Just assign block_rsv->size to block_rsv->reserved instead of the math.
>>
>> Signed-off-by: Anand Jain <anand.jain@oracle.com>
>> ---
>>   fs/btrfs/block-rsv.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
>> index 6dacde9a7e93..62e0885c1e5d 100644
>> --- a/fs/btrfs/block-rsv.c
>> +++ b/fs/btrfs/block-rsv.c
>> @@ -304,9 +304,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
>>   
>>   	if (block_rsv->reserved < block_rsv->size) {
>>   		num_bytes = block_rsv->size - block_rsv->reserved;
>> -		block_rsv->reserved += num_bytes;
>>   		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
>>   						      num_bytes);
>> +		block_rsv->reserved = block_rsv->size;
> 
> Any particular reason why you put the assignment after
> btrfs_space_info_update_bytes_may_use and not before?

  Oh. To make it similar to the else if part below.

Thanks.

>>   	} else if (block_rsv->reserved > block_rsv->size) {
>>   		num_bytes = block_rsv->reserved - block_rsv->size;
>>   		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
>>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] btrfs: drop math for block_reserved which is block_rsv size
  2020-02-04 12:46   ` Anand Jain
@ 2020-02-24 19:08     ` David Sterba
  0 siblings, 0 replies; 4+ messages in thread
From: David Sterba @ 2020-02-24 19:08 UTC (permalink / raw)
  To: Anand Jain; +Cc: Nikolay Borisov, linux-btrfs

On Tue, Feb 04, 2020 at 08:46:04PM +0800, Anand Jain wrote:
> 
> 
> On 2/4/20 7:10 PM, Nikolay Borisov wrote:
> > 
> > 
> > On 4.02.20 г. 13:05 ч., Anand Jain wrote:
> >> In btrfs_update_global_block_rsv the lines
> >>    num_bytes = block_rsv->size - block_rsv->reserved;
> >>    block_rsv->reserved += num_bytes;
> >> imply
> >>    block_rsv->reserved = block_rsv->size;
> >>
> >> Just assign block_rsv->size to block_rsv->reserved instead of the math.
> >>
> >> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> >> ---
> >>   fs/btrfs/block-rsv.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
> >> index 6dacde9a7e93..62e0885c1e5d 100644
> >> --- a/fs/btrfs/block-rsv.c
> >> +++ b/fs/btrfs/block-rsv.c
> >> @@ -304,9 +304,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
> >>   
> >>   	if (block_rsv->reserved < block_rsv->size) {
> >>   		num_bytes = block_rsv->size - block_rsv->reserved;
> >> -		block_rsv->reserved += num_bytes;
> >>   		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
> >>   						      num_bytes);
> >> +		block_rsv->reserved = block_rsv->size;
> > 
> > Any particular reason why you put the assignment after
> > btrfs_space_info_update_bytes_may_use and not before?
> 
>   Oh. To make it similar to the else if part below.

Makes sense. For cleanup patches, such things can be mentioned in the
changelog, reordering lines may have indirect implications eg. if the
block_rsv would be used in btrfs_space_info_update_bytes_may_use (but it
is not). Patch added to misc-next, thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-02-24 19:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-04 11:05 [PATCH] btrfs: drop math for block_reserved which is block_rsv size Anand Jain
2020-02-04 11:10 ` Nikolay Borisov
2020-02-04 12:46   ` Anand Jain
2020-02-24 19:08     ` David Sterba

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).