diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2016-05-02 16:51:10 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-06-16 09:04:10 -0700 |
| commit | 9af36b95976d4e54859c9b60bd2e711518b3be6e (patch) | |
| tree | 98b4c7fa8b0c96cfabce8d59b1df34e64f9d6a44 /xlators/nfs | |
| parent | 650459c4178eff6fba82351d044c995ab7d046b1 (diff) | |
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 <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/14663
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/nfs')
| -rw-r--r-- | xlators/nfs/server/src/nfs-fops.c | 16 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3.c | 18 |
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 e5990a1e834..167f6b7e9f7 100644 --- a/xlators/nfs/server/src/nfs-fops.c +++ b/xlators/nfs/server/src/nfs-fops.c @@ -1386,6 +1386,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; @@ -1403,8 +1405,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 4035491359f..aa7af312b89 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -2245,24 +2245,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); |