|
 |
21ab4e |
From 8e820e1170faa0fe1f4f2a2bd056a8b74431da0b Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Ravishankar N <ravishankar@redhat.com>
|
|
|
21ab4e |
Date: Tue, 23 May 2017 10:15:41 +0530
|
|
|
21ab4e |
Subject: [PATCH 472/473] protocol/server: capture offset in seek
|
|
|
21ab4e |
|
|
|
21ab4e |
Backport of https://review.gluster.org/#/c/15920/
|
|
|
21ab4e |
|
|
|
21ab4e |
Problem: http://review.gluster.org/11482 implemented seek FOP but
|
|
|
21ab4e |
http://review.gluster.org/#/c/14137/ 'undid' the change where we pack
|
|
|
21ab4e |
the offset returned by seek in server xlator before sending it to the
|
|
|
21ab4e |
client. As a result, seek always returns zero to the client for
|
|
|
21ab4e |
SEEK_HOLE/ SEEK_DATA.
|
|
|
21ab4e |
|
|
|
21ab4e |
Fix: 14137 removed it unintentionally, hence adding it back again.
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Ia0be4b09ff76849d7ae366d676c43fbe6c748984
|
|
|
21ab4e |
BUG: 1454558
|
|
|
21ab4e |
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/106934
|
|
|
21ab4e |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/protocol/server/src/server-common.c | 6 ++++++
|
|
|
21ab4e |
xlators/protocol/server/src/server-common.h | 3 +++
|
|
|
21ab4e |
xlators/protocol/server/src/server-rpc-fops.c | 2 ++
|
|
|
21ab4e |
3 files changed, 11 insertions(+)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/protocol/server/src/server-common.c b/xlators/protocol/server/src/server-common.c
|
|
|
21ab4e |
index 9a023aa..2cabcf9 100644
|
|
|
21ab4e |
--- a/xlators/protocol/server/src/server-common.c
|
|
|
21ab4e |
+++ b/xlators/protocol/server/src/server-common.c
|
|
|
21ab4e |
@@ -226,6 +226,12 @@ server_post_fallocate (gfs3_fallocate_rsp *rsp, struct iatt *statpre,
|
|
|
21ab4e |
gf_stat_from_iatt (&rsp->statpost, statpost);
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
+void
|
|
|
21ab4e |
+server_post_seek (gfs3_seek_rsp *rsp, off_t offset)
|
|
|
21ab4e |
+{
|
|
|
21ab4e |
+ rsp->offset = offset;
|
|
|
21ab4e |
+}
|
|
|
21ab4e |
+
|
|
|
21ab4e |
int
|
|
|
21ab4e |
server_post_readdirp (gfs3_readdirp_rsp *rsp, gf_dirent_t *entries)
|
|
|
21ab4e |
{
|
|
|
21ab4e |
diff --git a/xlators/protocol/server/src/server-common.h b/xlators/protocol/server/src/server-common.h
|
|
|
21ab4e |
index afd9fb8..f3b9ced 100644
|
|
|
21ab4e |
--- a/xlators/protocol/server/src/server-common.h
|
|
|
21ab4e |
+++ b/xlators/protocol/server/src/server-common.h
|
|
|
21ab4e |
@@ -81,6 +81,9 @@ void
|
|
|
21ab4e |
server_post_fallocate (gfs3_fallocate_rsp *rsp, struct iatt *statpre,
|
|
|
21ab4e |
struct iatt *statpost);
|
|
|
21ab4e |
|
|
|
21ab4e |
+void
|
|
|
21ab4e |
+server_post_seek (gfs3_seek_rsp *rsp, off_t offset);
|
|
|
21ab4e |
+
|
|
|
21ab4e |
int
|
|
|
21ab4e |
server_post_readdirp (gfs3_readdirp_rsp *rsp, gf_dirent_t *entries);
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
|
|
|
21ab4e |
index 94e756c..a9f5d86 100644
|
|
|
21ab4e |
--- a/xlators/protocol/server/src/server-rpc-fops.c
|
|
|
21ab4e |
+++ b/xlators/protocol/server/src/server-rpc-fops.c
|
|
|
21ab4e |
@@ -2010,6 +2010,8 @@ server_seek_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
|
|
|
21ab4e |
goto out;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
+ server_post_seek (&rsp, offset);
|
|
|
21ab4e |
+
|
|
|
21ab4e |
out:
|
|
|
21ab4e |
rsp.op_ret = op_ret;
|
|
|
21ab4e |
rsp.op_errno = gf_errno_to_error (op_errno);
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|