summaryrefslogtreecommitdiffstats
path: root/xlators/nfs
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-05-02 16:51:10 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-06-07 00:19:26 -0700
commiteb1744582d57d0f9fe08275781800c0c3459697f (patch)
tree126a60c9ee95c26cf1a0b60a5ad2a55ce0b4b7f4 /xlators/nfs
parenteb7ba8984c5e66b57d592f9da606fbdd1133df3b (diff)
core, shard: Make shards inherit main file's O_DIRECT flag if present
If the application opens a file with O_DIRECT, the shards' anon fds would also need to inherit the flag. Towards this, shard xl would be passing the odirect flag in the @flags parameter to the WRITEV fop. This will be used in anon fd resolution and subsequent opening by posix xl. Change-Id: Iddb75c9ed14ce5a8c5d2128ad09b749f46e3b0c2 BUG: 1342171 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/14191 Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'xlators/nfs')
-rw-r--r--xlators/nfs/server/src/nfs-fops.c16
-rw-r--r--xlators/nfs/server/src/nfs3.c18
2 files changed, 15 insertions, 19 deletions
diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c
index 52fdd9796c3..f6361f02161 100644
--- a/xlators/nfs/server/src/nfs-fops.c
+++ b/xlators/nfs/server/src/nfs-fops.c
@@ -1382,6 +1382,8 @@ nfs_fop_write (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
call_frame_t *frame = NULL;
int ret = -EFAULT;
struct nfs_fop_local *nfl = NULL;
+ int flags = 0;
+ nfs3_call_state_t *cs = local;
if ((!nfsx) || (!xl) || (!fd) || (!vector) || (!nfu) || (!srciobref))
return ret;
@@ -1399,8 +1401,20 @@ nfs_fop_write (xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
iobref_add (nfl->iobref, srciob);
*/
+
+ switch (cs->writetype) {
+ case UNSTABLE:
+ break;
+ case DATA_SYNC:
+ flags |= O_DSYNC;
+ break;
+ case FILE_SYNC:
+ flags |= O_SYNC;
+ break;
+ }
+
STACK_WIND_COOKIE (frame, nfs_fop_writev_cbk, xl, xl,xl->fops->writev,
- fd, vector, count, offset, fd->flags, srciobref, NULL);
+ fd, vector, count, offset, flags, srciobref, NULL);
ret = 0;
err:
if (ret < 0) {
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 8cf4db8174a..67b619ece13 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -2240,24 +2240,6 @@ nfs3_write_resume (void *carg)
cs->fd = fd; /* Gets unrefd when the call state is wiped. */
-/*
- enum stable_how {
- UNSTABLE = 0,
- DATA_SYNC = 1,
- FILE_SYNC = 2,
- };
-*/
- switch (cs->writetype) {
- case UNSTABLE:
- break;
- case DATA_SYNC:
- fd->flags |= O_DSYNC;
- break;
- case FILE_SYNC:
- fd->flags |= O_SYNC;
- break;
- }
-
ret = __nfs3_write_resume (cs);
if (ret < 0)
stat = nfs3_errno_to_nfsstat3 (-ret);