diff options
| author | Wang Shilong <wangsl-fnst@cn.fujitsu.com> | 2013-03-06 11:51:47 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-03-14 14:57:29 -0400 |
| commit | 720f1e2060138855b4a1b1e8aa642f9c7feb6750 (patch) | |
| tree | 797d17e6d4e620e7842fc7ce26672ab17904c6d4 /fs/btrfs | |
| parent | 492104c866cb1b62a11393adccb477f5cd2c7768 (diff) | |
| download | linux-stable-720f1e2060138855b4a1b1e8aa642f9c7feb6750.tar.gz linux-stable-720f1e2060138855b4a1b1e8aa642f9c7feb6750.tar.bz2 linux-stable-720f1e2060138855b4a1b1e8aa642f9c7feb6750.zip | |
Btrfs: return as soon as possible when edquot happens
If one of qgroup fails to reserve firstly, we should return immediately,
it is unnecessary to continue check.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/qgroup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index aee4b1cc3d98..5471e47d6559 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1525,21 +1525,23 @@ int btrfs_qgroup_reserve(struct btrfs_root *root, u64 num_bytes) if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_RFER) && qg->reserved + qg->rfer + num_bytes > - qg->max_rfer) + qg->max_rfer) { ret = -EDQUOT; + goto out; + } if ((qg->lim_flags & BTRFS_QGROUP_LIMIT_MAX_EXCL) && qg->reserved + qg->excl + num_bytes > - qg->max_excl) + qg->max_excl) { ret = -EDQUOT; + goto out; + } list_for_each_entry(glist, &qg->groups, next_group) { ulist_add(ulist, glist->group->qgroupid, (uintptr_t)glist->group, GFP_ATOMIC); } } - if (ret) - goto out; /* * no limits exceeded, now record the reservation into all qgroups |