From 0fea541b0b217fc3c76e6a36577b99be71e32d56 Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Tue, 7 Jun 2016 17:15:56 +0530 Subject: libglusterfs: Negate all but O_DIRECT flag if present on anon fds Backport of: http://review.gluster.org/14665 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: Ib0110731d6099bc888b7ada552a2abbea8e76051 BUG: 1342903 Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/14735 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Pranith Kumar Karampuri CentOS-regression: Gluster Build System --- libglusterfs/src/fd.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index 89ba357fc1e..5a3658b5a3e 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -817,17 +817,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); -- cgit