Attachment 14168 Details for Bug 13412 – git-am fix for 4.8.next, 4.7.next.

[patch] git-am fix for 4.8.next, 4.7.next.

0001-ceph-VFS-Add-asynchronous-fsync-to-ceph-module-fake-.patch (text/plain), 2.96 KB, created by Jeremy Allison on 2018-05-01 23:04:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2018-05-01 23:04:56 UTC

Size: 2.96 KB

patch

obsolete

>From a743f99561e45070196c9cd5120e8b6b956b23f3 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 27 Apr 2018 14:25:54 -0700
>Subject: [PATCH] ceph: VFS: Add asynchronous fsync to ceph module, fake using
> synchronous call.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This will allow me to ultimately simplify the VFS by removing the synchronous
>fsync VFS call.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13412
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Mon Apr 30 21:48:55 CEST 2018 on sn-devel-144
>
>(cherry picked from commit aefe444d17a2eee3c0ff38bd34cf9e3f012ecf51)
>---
> source3/modules/vfs_ceph.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 53 insertions(+)
>
>diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
>index d61213110e0..656ce57009f 100644
>--- a/source3/modules/vfs_ceph.c
>+++ b/source3/modules/vfs_ceph.c
>@@ -37,6 +37,7 @@
> #include "cephfs/libcephfs.h"
> #include "smbprofile.h"
> #include "modules/posixacl_xattr.h"
>+#include "lib/util/tevent_unix.h"
> 
> #undef DBGC_CLASS
> #define DBGC_CLASS DBGC_VFS
>@@ -569,6 +570,56 @@ static int cephwrap_fsync(struct vfs_handle_struct *handle, files_struct *fsp)
> 	WRAP_RETURN(result);
> }
> 
>+/*
>+ * Fake up an async ceph fsync by calling the sychronous API.
>+ */
>+
>+static struct tevent_req *cephwrap_fsync_send(struct vfs_handle_struct *handle,
>+					TALLOC_CTX *mem_ctx,
>+					struct tevent_context *ev,
>+					files_struct *fsp)
>+{
>+	struct tevent_req *req = NULL;
>+	struct vfs_aio_state *state = NULL;
>+	int ret = -1;
>+
>+	DBG_DEBUG("[CEPH] cephwrap_fsync_send\n");
>+
>+	req = tevent_req_create(mem_ctx, &state, struct vfs_aio_state);
>+	if (req == NULL) {
>+		return NULL;
>+	}
>+
>+	/* Make sync call. */
>+	ret = ceph_fsync(handle->data, fsp->fh->fd, false);
>+
>+	if (ret != 0) {
>+		/* ceph_fsync returns -errno on error. */
>+		tevent_req_error(req, -ret);
>+		return tevent_req_post(req, ev);
>+	}
>+
>+	/* Mark it as done. */
>+	tevent_req_done(req);
>+	/* Return and schedule the completion of the call. */
>+	return tevent_req_post(req, ev);
>+}
>+
>+static int cephwrap_fsync_recv(struct tevent_req *req,
>+				struct vfs_aio_state *vfs_aio_state)
>+{
>+	struct vfs_aio_state *state =
>+		tevent_req_data(req, struct vfs_aio_state);
>+
>+	DBG_DEBUG("[CEPH] cephwrap_fsync_recv\n");
>+
>+	if (tevent_req_is_unix_error(req, &vfs_aio_state->error)) {
>+		return -1;
>+	}
>+	*vfs_aio_state = *state;
>+	return 0;
>+}
>+
> #ifdef HAVE_CEPH_STATX
> #define SAMBA_STATX_ATTR_MASK	(CEPH_STATX_BASIC_STATS|CEPH_STATX_BTIME)
> 
>@@ -1440,6 +1491,8 @@ static struct vfs_fn_pointers ceph_fns = {
> 	.recvfile_fn = cephwrap_recvfile,
> 	.rename_fn = cephwrap_rename,
> 	.fsync_fn = cephwrap_fsync,
>+	.fsync_send_fn = cephwrap_fsync_send,
>+	.fsync_recv_fn = cephwrap_fsync_recv,
> 	.stat_fn = cephwrap_stat,
> 	.fstat_fn = cephwrap_fstat,
> 	.lstat_fn = cephwrap_lstat,
>-- 
>2.14.1
>

Flags:

slow: review+

Actions: View

Attachments on bug 13412: 14168