From 42d6a493570599277ed88b51ab0fb9760840ed1b Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Mon, 2 May 2016 16:51:10 +0530 Subject: core, shard: Make shards inherit main file's O_DIRECT flag if present Backport of: http://review.gluster.org/14191 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: I3a0593fa46cc25e390a5762a0354b469c2a1532d >BUG: 1342903 >Signed-off-by: Krutika Dhananjay >Reviewed-on: http://review.gluster.org/14663 >Smoke: Gluster Build System >CentOS-regression: Gluster Build System >NetBSD-regression: NetBSD Build System >Reviewed-by: Jeff Darcy Change-Id: Ibfc164aa7f9eecd6993255f1c03557f2ec35ac8c BUG: 1347553 Signed-off-by: Krutika Dhananjay Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/14754 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- xlators/nfs/server/src/nfs-fops.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'xlators/nfs/server/src/nfs-fops.c') 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) { -- cgit