diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2015-01-01 15:16:41 +0000 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-01-05 22:00:09 -0800 |
| commit | c4ab37c02e9edc23d0637e23d6f2b42d0827dad2 (patch) | |
| tree | 0dc06a6b8288ff8f33b47ad7d98ee4daffe74af4 /api | |
| parent | b8e3b91b8180dcc5e9f8bb62734832ace69ad143 (diff) | |
libglusterfs: change signature of syncop_(f)getxattr
Pass xdata dict to syncop_(f)getxattr calls.
This patch [1/3] is required as a part of afr automated split-brain resolution
implementation.
Change-Id: I3970b3dd6daf64681a031e37f8e9afb14fb3d668
BUG: 1136769
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/9375
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/src/glfs-fops.c | 8 | ||||
| -rw-r--r-- | api/src/glfs-handleops.c | 2 | ||||
| -rw-r--r-- | api/src/glfs-resolve.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index b93a077fcdf..a0315e305b1 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -2621,7 +2621,7 @@ retry: if (ret) goto out; - ret = syncop_getxattr (subvol, &loc, &xattr, name); + ret = syncop_getxattr (subvol, &loc, &xattr, name, NULL); DECODE_SYNCOP_ERR (ret); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -2684,7 +2684,7 @@ pub_glfs_fgetxattr (struct glfs_fd *glfd, const char *name, void *value, goto out; } - ret = syncop_fgetxattr (subvol, fd, &xattr, name); + ret = syncop_fgetxattr (subvol, fd, &xattr, name, NULL); DECODE_SYNCOP_ERR (ret); if (ret) goto out; @@ -2761,7 +2761,7 @@ retry: if (ret) goto out; - ret = syncop_getxattr (subvol, &loc, &xattr, NULL); + ret = syncop_getxattr (subvol, &loc, &xattr, NULL, NULL); DECODE_SYNCOP_ERR (ret); ESTALE_RETRY (ret, errno, reval, &loc, retry); @@ -2821,7 +2821,7 @@ pub_glfs_flistxattr (struct glfs_fd *glfd, void *value, size_t size) goto out; } - ret = syncop_fgetxattr (subvol, fd, &xattr, NULL); + ret = syncop_fgetxattr (subvol, fd, &xattr, NULL, NULL); DECODE_SYNCOP_ERR (ret); if (ret) goto out; diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index a82cab52dec..706c00f98eb 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -266,7 +266,7 @@ pub_glfs_h_getxattrs (struct glfs *fs, struct glfs_object *object, /* populate loc */ GLFS_LOC_FILL_INODE (inode, loc, out); - ret = syncop_getxattr (subvol, &loc, &xattr, name); + ret = syncop_getxattr (subvol, &loc, &xattr, name, NULL); DECODE_SYNCOP_ERR (ret); if (ret) diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c index 7aa5cc6158e..3b76487cd25 100644 --- a/api/src/glfs-resolve.c +++ b/api/src/glfs-resolve.c @@ -557,7 +557,7 @@ glfs_migrate_fd_locks_safe (struct glfs *fs, xlator_t *oldsubvol, fd_t *oldfd, newfd->lk_ctx = fd_lk_ctx_ref (oldfd->lk_ctx); ret = syncop_fgetxattr (oldsubvol, oldfd, &lockinfo, - GF_XATTR_LOCKINFO_KEY); + GF_XATTR_LOCKINFO_KEY, NULL); DECODE_SYNCOP_ERR (ret); if (ret < 0) { gf_log (fs->volname, GF_LOG_WARNING, |