diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2018-02-12 15:13:49 +0800 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-02-12 21:34:46 +0000 |
| commit | d01f7244e9d9f7e3ef84e0ba7b48ef1b1b09d809 (patch) | |
| tree | 1a95023e8a4097e9a07ded99642228894876d8b5 /xlators/cluster | |
| parent | bfb66cc535ce473afa7e330800d2d2c38afe42c9 (diff) | |
gfapi: return pre/post attributes from glfs_pread/pwrite
As nfs-ganesha, a wcc data contains pre/post attributes is return
in read/write rpc reply. nfs-ganesha get those attributes by
two getattr between the real read/write right now.
But, gluster has return pre/post attributes from glusterfsd,
those attributes are skipped in syncop/gfapi, if gfapi return them,
the upper user (nfs-ganesha) can use them directly without any
duplicate getattr.
Updates: #389
Change-Id: I7b643ae4241cfe2aeb17063de00192d81674024a
Signed-off-by: Kinglong Mee <mijinlong@open-fs.com>
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 6 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index c033a8afc07..bc710ea458f 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -128,7 +128,7 @@ __afr_is_sink_zero_filled (xlator_t *this, fd_t *fd, size_t size, priv = this->private; ret = syncop_readv (priv->children[sink], fd, size, offset, 0, &iovec, - &count, &iobref, NULL, NULL); + &count, &iobref, NULL, NULL, NULL); if (ret < 0) goto out; ret = iov_0filled (iovec, count); @@ -158,7 +158,7 @@ __afr_selfheal_data_read_write (call_frame_t *frame, xlator_t *this, fd_t *fd, priv = this->private; ret = syncop_readv (priv->children[source], fd, size, offset, 0, - &iovec, &count, &iobref, NULL, NULL); + &iovec, &count, &iobref, NULL, NULL, NULL); if (ret <= 0) return ret; @@ -207,7 +207,7 @@ __afr_selfheal_data_read_write (call_frame_t *frame, xlator_t *this, fd_t *fd, } ret = syncop_writev (priv->children[i], fd, iovec, count, - offset, iobref, 0, NULL, NULL); + offset, iobref, 0, NULL, NULL, NULL, NULL); if (ret != iov_length (iovec, count)) { /* write() failed on this sink. unset the corresponding member in sinks[] (which is healed_sinks[] in the diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 4ebdf05387a..68afb2615a6 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -1159,7 +1159,7 @@ __dht_rebalance_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, ret = syncop_readv (from, src, read_size, offset, 0, &vector, &count, &iobref, NULL, - NULL); + NULL, NULL); if (!ret || (ret < 0)) { *fop_errno = -ret; break; @@ -1205,7 +1205,8 @@ __dht_rebalance_migrate_data (xlator_t *this, gf_defrag_info_t *defrag, } ret = syncop_writev (to, dst, vector, count, - offset, iobref, 0, xdata, NULL); + offset, iobref, 0, NULL, NULL, + xdata, NULL); if (ret < 0) { *fop_errno = -ret; } |