summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2016-11-24 08:31:47 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-11-28 02:33:10 -0800
commitcc37e5929d1e3ea4eaf4c4576a82066bf131ad05 (patch)
treee35fea050ce75d55b72d10ab876c45601056a633
parent2e859ee88f285a098a5c02bd2bdc0cd4bbd44d56 (diff)
protocol/server: capture offset in seek
Problem: http://review.gluster.org/11482 implemented seek FOP but http://review.gluster.org/#/c/14137/ 'undid' the change where we pack the offset returned by seek in server xlator before sending it to the client. As a result, seek always returns zero to the client for SEEK_HOLE/ SEEK_DATA. Fix: I think 14137 removed it unintentionally, hence adding it back again. Signed-off-by: Ravishankar N <ravishankar@redhat.com> Change-Id: I67a1f7b53214b043c5291f5704be4a50b698f91c BUG: 1398076 Reviewed-on: http://review.gluster.org/15920 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rw-r--r--xlators/protocol/server/src/server-common.c6
-rw-r--r--xlators/protocol/server/src/server-common.h3
-rw-r--r--xlators/protocol/server/src/server-rpc-fops.c1
3 files changed, 10 insertions, 0 deletions
diff --git a/xlators/protocol/server/src/server-common.c b/xlators/protocol/server/src/server-common.c
index 90d66dd..4a55e7e 100644
--- a/xlators/protocol/server/src/server-common.c
+++ b/xlators/protocol/server/src/server-common.c
@@ -226,6 +226,12 @@ server_post_fallocate (gfs3_fallocate_rsp *rsp, struct iatt *statpre,
gf_stat_from_iatt (&rsp->statpost, statpost);
}
+void
+server_post_seek (gfs3_seek_rsp *rsp, off_t offset)
+{
+ rsp->offset = offset;
+}
+
int
server_post_readdirp (gfs3_readdirp_rsp *rsp, gf_dirent_t *entries)
{
diff --git a/xlators/protocol/server/src/server-common.h b/xlators/protocol/server/src/server-common.h
index afd9fb8..f3b9ced 100644
--- a/xlators/protocol/server/src/server-common.h
+++ b/xlators/protocol/server/src/server-common.h
@@ -81,6 +81,9 @@ void
server_post_fallocate (gfs3_fallocate_rsp *rsp, struct iatt *statpre,
struct iatt *statpost);
+void
+server_post_seek (gfs3_seek_rsp *rsp, off_t offset);
+
int
server_post_readdirp (gfs3_readdirp_rsp *rsp, gf_dirent_t *entries);
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
index e52a7c8..dff495cc 100644
--- a/xlators/protocol/server/src/server-rpc-fops.c
+++ b/xlators/protocol/server/src/server-rpc-fops.c
@@ -2071,6 +2071,7 @@ server_seek_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
goto out;
}
+ server_post_seek (&rsp, offset);
out:
rsp.op_ret = op_ret;
rsp.op_errno = gf_errno_to_error (op_errno);