diff options
| author | Raghavendra G <raghavendra@gluster.com> | 2011-07-10 23:30:55 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-11 22:07:23 -0700 |
| commit | 2b2bddecb13465486fdcd9599bbdd95b23151c9d (patch) | |
| tree | 42d9991ac5e2e50497f6cc542ecce857a282d886 /xlators | |
| parent | 817bda650cb7edb0bfdef270cd2801d91d681580 (diff) | |
quota: update limit stored in inode-ctx when limit is removed on a directory.
Signed-off-by: Raghavendra G <raghavendra@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2971 (quota remove command doesn't remove quota on directories.)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2971
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/quota/src/quota.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index 5d1f304f4be..8071a1491d3 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -583,12 +583,17 @@ quota_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, quota_dentry_t *dentry = NULL; quota_priv_t *priv = NULL; int64_t *size = 0; + uint64_t value = 0; local = frame->local; + inode_ctx_get (inode, this, &value); + ctx = (quota_inode_ctx_t *)(unsigned long)value; + if ((op_ret < 0) || (local == NULL) - || ((local->limit < 0) && !((IA_ISREG (buf->ia_type)) - || (IA_ISLNK (buf->ia_type))))) { + || (((ctx == NULL) || (ctx->limit == local->limit)) + && (local->limit < 0) && !((IA_ISREG (buf->ia_type)) + || (IA_ISLNK (buf->ia_type))))) { goto unwind; } |