summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-06-07 17:15:56 +0530
committerAtin Mukherjee <amukherj@redhat.com>2016-06-09 22:05:46 -0700
commit79dfe7d197ced45bd3b84f71d5c889e95f4dec1a (patch)
tree5af6a4aaa87a022eabcc9201dce9eba766ae7dbb /libglusterfs/src
parent3bd4b1529817d4ce40c2b9654044e6230cbf7233 (diff)
libglusterfs: Negate all but O_DIRECT flag if present on anon fds
This is to prevent any unforeseen problems that might arise due to writevs and readvs being wound with @flag parameter containing O_TRUNC or O_APPEND especially wrt translators like sharding and ec where O_TRUNC write or O_APPEND write on individual shards/fragments is not the same as O_TRUNC write or O_APPEND write as expected by the application. Change-Id: I9e5206a6ce2b1b70df61ff23b1c961cf25bf7ff9 BUG: 1342171 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/14665 Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Smoke: Gluster Build System <jenkins@build.gluster.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'libglusterfs/src')
-rw-r--r--libglusterfs/src/fd.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index 7177fa275db..118f876c396 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -812,17 +812,11 @@ fd_anonymous_with_flags (inode_t *inode, int32_t flags)
LOCK (&inode->lock);
{
- if (flags == 0)
+ if (flags & O_DIRECT)
+ flags = GF_ANON_FD_FLAGS | O_DIRECT;
+ else
flags = GF_ANON_FD_FLAGS;
- /* If this API is ever called with O_SYNC or O_DSYNC in @flags,
- * reset the bits associated with these flags before calling
- * __fd_anonymous(). That way, posix will do the open() without
- * these flags. And subsequently, posix_writev() (mostly) will
- * do the write within inode->lock on an fd without O_SYNC or
- * O_DSYNC and in its place to an fsync() outside of the locks
- * to simulate the effect of using these flags.
- */
- flags &= (~(O_SYNC|O_DSYNC));
+
fd = __fd_anonymous (inode, flags);
}
UNLOCK (&inode->lock);