syncop: handle 'dataonly' flag in syncop_fsync()

* and also in syncop_readv(), don't look at _cbk args if op_ret
  is < 0.

Change-Id: I3ab2982bc6d186e75b6adb74c8981e4ff7058bbe
Signed-off-by: Amar Tumballi <amarts@redhat.com>
BUG: 839950
Reviewed-on: http://review.gluster.org/3828
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/libglusterfs/src/syncop.c b/libglusterfs/src/syncop.c
index cbd20251500..2f80f5d8009 100644
--- a/libglusterfs/src/syncop.c
+++ b/libglusterfs/src/syncop.c
@@ -989,9 +989,13 @@ syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
         SYNCOP (subvol, (&args), syncop_readv_cbk, subvol->fops->readv,
                 fd, size, off, flags, NULL);
 
+        if (args.op_ret < 0)
+                goto out;
+
         if (vector)
                 *vector = args.vector;
-        else GF_FREE (args.vector);
+        else
+                GF_FREE (args.vector);
 
         if (count)
                 *count = args.count;
@@ -1002,6 +1006,7 @@ syncop_readv (xlator_t *subvol, fd_t *fd, size_t size, off_t off,
         else if (args.iobref)
                 iobref_unref (args.iobref);
 
+out:
         errno = args.op_errno;
         return args.op_ret;
 
@@ -1220,12 +1225,12 @@ syncop_fsync_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 }
 
 int
-syncop_fsync (xlator_t *subvol, fd_t *fd)
+syncop_fsync (xlator_t *subvol, fd_t *fd, int dataonly)
 {
         struct syncargs args = {0, };
 
         SYNCOP (subvol, (&args), syncop_fsync_cbk, subvol->fops->fsync,
-                fd, 0, NULL);
+                fd, dataonly, NULL);
 
         errno = args.op_errno;
         return args.op_ret;