From 807c7debe3c36ff911e6f7081e066b251d2a0ee4 Mon Sep 17 00:00:00 2001
From: Pranith Kumar K <pkarampu@redhat.com>
Date: Thu, 5 May 2016 07:59:03 +0530
Subject: [PATCH 186/192] protocol/client: Filter o-direct in readv/writev

        Backport of: http://review.gluster.org/14215

Change-Id: I55e53492a878284ed1c75b018d5203b2f5d79032
BUG: 1339136
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/75848
---
 xlators/protocol/client/src/client.c |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 2e9fb4c..3191a98 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -36,6 +36,13 @@ int client_init_rpc (xlator_t *this);
 int client_destroy_rpc (xlator_t *this);
 int client_mark_fd_bad (xlator_t *this);
 
+static void
+client_filter_o_direct (clnt_conf_t *conf, int32_t *flags)
+{
+        if (conf->filter_o_direct)
+                *flags = (*flags & ~O_DIRECT);
+}
+
 static int
 client_fini_complete (xlator_t *this)
 {
@@ -797,11 +804,9 @@ client_create (call_frame_t *frame, xlator_t *this, loc_t *loc,  int32_t flags,
         args.fd = fd;
         args.umask = umask;
         args.xdata = xdata;
+        args.flags = flags;
 
-        if (!conf->filter_o_direct)
-                args.flags = flags;
-        else
-                args.flags = (flags & ~O_DIRECT);
+        client_filter_o_direct (conf, &args.flags);
 
         proc = &conf->fops->proctable[GF_FOP_CREATE];
         if (proc->fn)
@@ -832,11 +837,9 @@ client_open (call_frame_t *frame, xlator_t *this, loc_t *loc,
         args.loc = loc;
         args.fd = fd;
         args.xdata = xdata;
+        args.flags = flags;
 
-        if (!conf->filter_o_direct)
-                args.flags = flags;
-        else
-                args.flags = (flags & ~O_DIRECT);
+        client_filter_o_direct (conf, &args.flags);
 
         proc = &conf->fops->proctable[GF_FOP_OPEN];
         if (proc->fn)
@@ -870,6 +873,8 @@ client_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
         args.flags  = flags;
         args.xdata = xdata;
 
+        client_filter_o_direct (conf, &args.flags);
+
         proc = &conf->fops->proctable[GF_FOP_READ];
         if (proc->fn)
                 ret = proc->fn (frame, this, &args);
@@ -908,6 +913,8 @@ client_writev (call_frame_t *frame, xlator_t *this, fd_t *fd,
         args.iobref = iobref;
         args.xdata = xdata;
 
+        client_filter_o_direct (conf, &args.flags);
+
         proc = &conf->fops->proctable[GF_FOP_WRITE];
         if (proc->fn)
                 ret = proc->fn (frame, this, &args);
-- 
1.7.1