2021-06-17 09:58:50

by Zhen Lei

Subject: [PATCH 1/1] quota: remove unnecessary oom message

Fixes scripts/checkpatch.pl warning:
WARNING: Possible unnecessary 'out of memory' message

Remove it can help us save a bit of memory.

Signed-off-by: Zhen Lei <[email protected]>
---
fs/quota/quota_tree.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c
index c5562c871c8b..b097d02bad94 100644
--- a/fs/quota/quota_tree.c
+++ b/fs/quota/quota_tree.c
@@ -49,11 +49,7 @@ static int qtree_dqstr_in_blk(struct qtree_mem_dqinfo *info)

static char *getdqbuf(size_t size)
{
- char *buf = kmalloc(size, GFP_NOFS);
- if (!buf)
- printk(KERN_WARNING
- "VFS: Not enough memory for quota buffers.\n");
- return buf;
+ return kmalloc(size, GFP_NOFS);
}

static ssize_t read_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)
--
2.25.1

2021-06-17 16:10:51

by Jan Kara

Subject: Re: [PATCH 1/1] quota: remove unnecessary oom message

On Thu 17-06-21 17:16:27, Zhen Lei wrote:
> Fixes scripts/checkpatch.pl warning:
> WARNING: Possible unnecessary 'out of memory' message
>
> Remove it can help us save a bit of memory.
>
> Signed-off-by: Zhen Lei <[email protected]>

I agree the message is pointless. But when doing this, I guess we can just
get rid of getdqbuf() altogether and instead call kmalloc() directly in all
the places.

Honza

> diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c
> index c5562c871c8b..b097d02bad94 100644
> --- a/fs/quota/quota_tree.c
> +++ b/fs/quota/quota_tree.c
> @@ -49,11 +49,7 @@ static int qtree_dqstr_in_blk(struct qtree_mem_dqinfo *info)
>
> static char *getdqbuf(size_t size)
> {
> - char *buf = kmalloc(size, GFP_NOFS);
> - if (!buf)
> - printk(KERN_WARNING
> - "VFS: Not enough memory for quota buffers.\n");
> - return buf;
> + return kmalloc(size, GFP_NOFS);
> }
>
> static ssize_t read_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)
> --
> 2.25.1
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR

2021-06-18 03:29:23

by Zhen Lei

Subject: Re: [PATCH 1/1] quota: remove unnecessary oom message

On 2021/6/17 23:01, Jan Kara wrote:
> On Thu 17-06-21 17:16:27, Zhen Lei wrote:
>> Fixes scripts/checkpatch.pl warning:
>> WARNING: Possible unnecessary 'out of memory' message
>>
>> Remove it can help us save a bit of memory.
>>
>> Signed-off-by: Zhen Lei <[email protected]>
>
> I agree the message is pointless. But when doing this, I guess we can just
> get rid of getdqbuf() altogether and instead call kmalloc() directly in all
> the places.

OK, I will get rid of it in v2.

>
> Honza
>
>> diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c
>> index c5562c871c8b..b097d02bad94 100644
>> --- a/fs/quota/quota_tree.c
>> +++ b/fs/quota/quota_tree.c
>> @@ -49,11 +49,7 @@ static int qtree_dqstr_in_blk(struct qtree_mem_dqinfo *info)
>>
>> static char *getdqbuf(size_t size)
>> {
>> - char *buf = kmalloc(size, GFP_NOFS);
>> - if (!buf)
>> - printk(KERN_WARNING
>> - "VFS: Not enough memory for quota buffers.\n");
>> - return buf;
>> + return kmalloc(size, GFP_NOFS);
>> }
>>
>> static ssize_t read_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf)
>> --
>> 2.25.1
>>
>>