changeset 823:a525d07c3fda

objstore: use obj_read instead of the read obj op Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Mon, 13 Apr 2020 20:08:13 -0400
parents 025b8d68c981
children 97cd91630768
files src/objstore/obj_dir.c src/objstore/obj_ops.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/objstore/obj_dir.c	Mon Apr 13 20:05:49 2020 -0400
+++ b/src/objstore/obj_dir.c	Mon Apr 13 20:08:13 2020 -0400
@@ -28,7 +28,7 @@
 	struct obj_dir_header hdr;
 	ssize_t ret;
 
-	ret = dirver->obj->ops->read(dirver, raw, rawsize, off);
+	ret = obj_read(dirver, raw, rawsize, off);
 	if (ret < 0)
 		return ret;
 	if (ret != DIR_BLOCK_SIZE)
--- a/src/objstore/obj_ops.c	Mon Apr 13 20:05:49 2020 -0400
+++ b/src/objstore/obj_ops.c	Mon Apr 13 20:08:13 2020 -0400
@@ -290,7 +290,7 @@
 		/* TODO: do we need to check for other types? */
 		ret = -EISDIR;
 	else
-		ret = obj->ops->read(open->ver, buf, len, offset);
+		ret = obj_read(open->ver, buf, len, offset);
 	MXUNLOCK(&obj->lock);
 
 	return ret;