diff options
| -rw-r--r-- | tests/bugs/quota/bug-1260545.t | 3 | ||||
| -rw-r--r-- | xlators/features/quota/src/quota.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/bugs/quota/bug-1260545.t b/tests/bugs/quota/bug-1260545.t index 7cd137dda61..b3e9eb42a9c 100644 --- a/tests/bugs/quota/bug-1260545.t +++ b/tests/bugs/quota/bug-1260545.t @@ -20,11 +20,12 @@ TEST $CLI volume quota $V0 enable; TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0; -TEST $CLI volume quota $V0 limit-usage / 15MB +TEST $CLI volume quota $V0 limit-usage / 10MB TEST $CLI volume quota $V0 hard-timeout 0 TEST $CLI volume quota $V0 soft-timeout 0 TEST $QDD $M0/f1 256 40 +TEST ! $QDD $M0/f2 256 40 EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "10.0MB" quotausage "/" diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index bd022eacdc1..3b803a0ca39 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -1373,7 +1373,7 @@ do_quota_check_limit (call_frame_t *frame, inode_t *inode, xlator_t *this, if (parent == NULL) goto out; - new_frame = create_frame (this, this->ctx->pool); + new_frame = copy_frame (frame); if (new_frame == NULL) goto out; @@ -1381,7 +1381,6 @@ do_quota_check_limit (call_frame_t *frame, inode_t *inode, xlator_t *this, if (new_local == NULL) goto out; - new_frame->root->uid = new_frame->root->gid = 0; new_frame->local = new_local; new_local->par_frame = frame; |