diff options
| author | vmallika <vmallika@redhat.com> | 2015-06-17 10:33:13 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2015-06-18 22:33:30 -0700 |
| commit | 13f11425a2736cdb5aa0403441b98d3f18d038f0 (patch) | |
| tree | 78d16d9662b65da31921cab8c0e273e4716d6d42 /xlators | |
| parent | c5c1ad0fae6701cc9350bda4e5dc6d33cdf28eca (diff) | |
quota: fix double accounting with rename operation
This is a backport of http://review.gluster.org/#/c/11264/
> When a rename operation is performed, we are renaming
> the file first and performing remove-xattr when reducing
> the contri size from parents.
> This remove-xattr fails as the file is alreday renamed,
> this failure causes reduce-parent-size to abort resulting
> in double quota accounting
>
> This patch fixes the problem. We don't need to perform remove-xattr
> operation on a file when performing reduce-parent-size txn as this
> will be alreday done before starting reduce-parent-size txn
>
> Change-Id: If86e3dbb0233f6deaaa90bee72cb0ec1689c7325
> BUG: 1232572
> Signed-off-by: vmallika <vmallika@redhat.com>
Change-Id: I7b12962d731ce9acf3ac78a99b2c23491722b78a
BUG: 1233117
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11312
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index e9351ed4e88..bb91fe2fc75 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -2590,9 +2590,11 @@ mq_remove_contri (xlator_t *this, loc_t *loc, inode_contribution_t *contri) ret = syncop_removexattr (FIRST_CHILD(this), loc, contri_key, 0, NULL); if (ret < 0) { - if (-ret == ENOENT || -ret == ESTALE) { + if (-ret == ENOENT || -ret == ESTALE || -ret == ENODATA) { /* Remove contri in done when unlink operation is * performed, so return success on ENOENT/ESTSLE + * rename operation removes xattr earlier, + * so return success on ENODATA */ ret = 0; } else { |