diff options
| author | Kefu Chai <tchaikov@gmail.com> | 2018-02-06 07:48:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-06 07:48:42 +0100 |
| commit | 12e3cbd13dc9b9f5bf9b42a3e22fa28676fd501f (patch) | |
| tree | 4ac4a24706d36513fa0f6eddef18e34ee8682c7a | |
| parent | Merge pull request #20260 from guzhongyan/fix-22042 (diff) | |
| parent | rados: clean up rados_getxattrs() and rados_striper_getxattrs() (diff) | |
| download | ceph-12e3cbd13dc9b9f5bf9b42a3e22fa28676fd501f.tar.xz ceph-12e3cbd13dc9b9f5bf9b42a3e22fa28676fd501f.zip | |
Merge pull request #20259 from guzhongyan/rados-cleanup
rados: clean up rados_getxattrs() and rados_striper_getxattrs()
Reviewed-by: Sage Weil <sage@redhat.com>
| -rw-r--r-- | src/librados/librados.cc | 2 | ||||
| -rw-r--r-- | src/libradosstriper/libradosstriper.cc | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/librados/librados.cc b/src/librados/librados.cc index b95b779a128..c97a07ccc19 100644 --- a/src/librados/librados.cc +++ b/src/librados/librados.cc @@ -4269,8 +4269,6 @@ extern "C" int rados_getxattrs(rados_ioctx_t io, const char *oid, } it->i = it->attrset.begin(); - librados::RadosXattrsIter **iret = (librados::RadosXattrsIter**)iter; - *iret = it; *iter = it; tracepoint(librados, rados_getxattrs_exit, 0, *iter); return 0; diff --git a/src/libradosstriper/libradosstriper.cc b/src/libradosstriper/libradosstriper.cc index 193ee16c05d..e7dc912eb2f 100644 --- a/src/libradosstriper/libradosstriper.cc +++ b/src/libradosstriper/libradosstriper.cc @@ -506,8 +506,6 @@ extern "C" int rados_striper_getxattrs(rados_striper_t striper, return ret; } it->i = it->attrset.begin(); - librados::RadosXattrsIter **iret = (librados::RadosXattrsIter**)iter; - *iret = it; *iter = it; return 0; } |