2019-03-20 05:06:04

by Chengguang Xu

Subject: [PATCH] quota: code cleanup for __dquot_alloc_space()

Replace (flags & DQUOT_SPACE_RESERVE) with
variable reserve.

Signed-off-by: Chengguang Xu <[email protected]>
---
fs/quota/dquot.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index fc20e06c56ba..00de508f9d2e 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1663,7 +1663,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
if (!dquots[cnt])
continue;
- if (flags & DQUOT_SPACE_RESERVE) {
+ if (reserve) {
ret = dquot_add_space(dquots[cnt], 0, number, flags,
&warn[cnt]);
} else {
@@ -1676,7 +1676,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
if (!dquots[cnt])
continue;
spin_lock(&dquots[cnt]->dq_dqb_lock);
- if (flags & DQUOT_SPACE_RESERVE) {
+ if (reserve) {
dquots[cnt]->dq_dqb.dqb_rsvspace -=
number;
} else {
--
2.20.1

2019-03-20 14:07:50

by Jan Kara

Subject: Re: [PATCH] quota: code cleanup for __dquot_alloc_space()

On Wed 20-03-19 13:03:59, Chengguang Xu wrote:
> Replace (flags & DQUOT_SPACE_RESERVE) with
> variable reserve.
>
> Signed-off-by: Chengguang Xu <[email protected]>

Thanks. I've added the patch to my tree.

Honza

> ---
> fs/quota/dquot.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
> index fc20e06c56ba..00de508f9d2e 100644
> --- a/fs/quota/dquot.c
> +++ b/fs/quota/dquot.c
> @@ -1663,7 +1663,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
> for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
> if (!dquots[cnt])
> continue;
> - if (flags & DQUOT_SPACE_RESERVE) {
> + if (reserve) {
> ret = dquot_add_space(dquots[cnt], 0, number, flags,
> &warn[cnt]);
> } else {
> @@ -1676,7 +1676,7 @@ int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags)
> if (!dquots[cnt])
> continue;
> spin_lock(&dquots[cnt]->dq_dqb_lock);
> - if (flags & DQUOT_SPACE_RESERVE) {
> + if (reserve) {
> dquots[cnt]->dq_dqb.dqb_rsvspace -=
> number;
> } else {
> --
> 2.20.1
>
>
--
Jan Kara <[email protected]>
SUSE Labs, CR