diff options
author | Krutika Dhananjay <kdhananj@redhat.com> | 2016-05-02 16:51:10 +0530 |
---|---|---|
committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-06-27 08:17:55 -0700 |
commit | 42d6a493570599277ed88b51ab0fb9760840ed1b (patch) | |
tree | 07555c817b29d8c84c8d95adfbdf49e6b4b577f3 /libglusterfs/src | |
parent | 7cbd3be5f8c5d70226e732a151a487eb047662b2 (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>
Change-Id: Ibfc164aa7f9eecd6993255f1c03557f2ec35ac8c
BUG: 1347553
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/14754
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'libglusterfs/src')
-rw-r--r-- | libglusterfs/src/fd.c | 41 | ||||
-rw-r--r-- | libglusterfs/src/fd.h | 4 |
2 files changed, 36 insertions, 9 deletions
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c index 373f8da0f48..7177fa275db 100644 --- a/libglusterfs/src/fd.c +++ b/libglusterfs/src/fd.c @@ -744,7 +744,7 @@ fd_lookup_uint64 (inode_t *inode, uint64_t pid) } static fd_t * -__fd_lookup_anonymous (inode_t *inode) +__fd_lookup_anonymous (inode_t *inode, int32_t flags) { fd_t *iter_fd = NULL; fd_t *fd = NULL; @@ -753,7 +753,7 @@ __fd_lookup_anonymous (inode_t *inode) return NULL; list_for_each_entry (iter_fd, &inode->fd_list, inode_list) { - if (iter_fd->anonymous) { + if ((iter_fd->anonymous) && (flags == iter_fd->flags)) { fd = __fd_ref (iter_fd); break; } @@ -763,11 +763,11 @@ __fd_lookup_anonymous (inode_t *inode) } static fd_t * -__fd_anonymous (inode_t *inode) +__fd_anonymous (inode_t *inode, int32_t flags) { fd_t *fd = NULL; - fd = __fd_lookup_anonymous (inode); + fd = __fd_lookup_anonymous (inode, flags); /* if (fd); then we already have increased the refcount in __fd_lookup_anonymous(), so no need of one more fd_ref(). @@ -780,7 +780,7 @@ __fd_anonymous (inode_t *inode) return NULL; fd->anonymous = _gf_true; - fd->flags = GF_ANON_FD_FLAGS; + fd->flags = GF_ANON_FD_FLAGS|flags; __fd_bind (fd); @@ -798,7 +798,32 @@ fd_anonymous (inode_t *inode) LOCK (&inode->lock); { - fd = __fd_anonymous (inode); + fd = __fd_anonymous (inode, GF_ANON_FD_FLAGS); + } + UNLOCK (&inode->lock); + + return fd; +} + +fd_t * +fd_anonymous_with_flags (inode_t *inode, int32_t flags) +{ + fd_t *fd = NULL; + + LOCK (&inode->lock); + { + if (flags == 0) + 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); @@ -806,7 +831,7 @@ fd_anonymous (inode_t *inode) } fd_t* -fd_lookup_anonymous (inode_t *inode) +fd_lookup_anonymous (inode_t *inode, int32_t flags) { fd_t *fd = NULL; @@ -818,7 +843,7 @@ fd_lookup_anonymous (inode_t *inode) LOCK (&inode->lock); { - fd = __fd_lookup_anonymous (inode); + fd = __fd_lookup_anonymous (inode, flags); } UNLOCK (&inode->lock); return fd; diff --git a/libglusterfs/src/fd.h b/libglusterfs/src/fd.h index 53ec93dec6c..31f494a7e8f 100644 --- a/libglusterfs/src/fd.h +++ b/libglusterfs/src/fd.h @@ -133,11 +133,13 @@ fd_t * fd_lookup_uint64 (struct _inode *inode, uint64_t pid); fd_t* -fd_lookup_anonymous (inode_t *inode); +fd_lookup_anonymous (inode_t *inode, int32_t flags); fd_t * fd_anonymous (inode_t *inode); +fd_t * +fd_anonymous_with_flags (inode_t *inode, int32_t flags); gf_boolean_t fd_is_anonymous (fd_t *fd); |