diff options
| -rw-r--r-- | contrib/fuse-include/fuse_kernel.h | 1 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-bridge.c | 3 | ||||
| -rw-r--r-- | xlators/performance/write-behind/src/write-behind.c | 5 | 
3 files changed, 9 insertions, 0 deletions
diff --git a/contrib/fuse-include/fuse_kernel.h b/contrib/fuse-include/fuse_kernel.h index c6396555c..0c3a11d54 100644 --- a/contrib/fuse-include/fuse_kernel.h +++ b/contrib/fuse-include/fuse_kernel.h @@ -162,6 +162,7 @@ struct fuse_file_lock {  #define FUSE_BIG_WRITES		(1 << 5)  #define FUSE_DONT_MASK		(1 << 6)  #define FUSE_DO_READDIRPLUS	(1 << 13) +#define FUSE_ASYNC_DIO		(1 << 15)  /**   * CUSE INIT request/reply flags diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 9f84779ae..43c98a23f 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -3671,6 +3671,9 @@ fuse_init (xlator_t *this, fuse_in_header_t *finh, void *msg)  	if (fini->flags & FUSE_DO_READDIRPLUS)  		fino.flags |= FUSE_DO_READDIRPLUS; +	if (fini->flags & FUSE_ASYNC_DIO) +		fino.flags |= FUSE_ASYNC_DIO; +          ret = send_fuse_obj (this, finh, &fino);          if (ret == 0)                  gf_log ("glusterfs-fuse", GF_LOG_INFO, diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index 055eed677..ebb8410a0 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -1194,12 +1194,17 @@ wb_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this,  	       struct iatt *prebuf, struct iatt *postbuf, dict_t *xdata)  {  	wb_request_t *req = NULL; +	wb_inode_t *wb_inode;  	req = frame->local;  	frame->local = NULL; +	wb_inode = req->wb_inode;  	wb_request_unref (req); +	/* requests could be pending while this was in progress */ +	wb_process_queue(wb_inode); +  	STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf,  			     xdata);  	return 0;  | 
