Attachment 872408 Details for Bug 1074023 – Initial patch: write max PAGESIZE bytes to /dev/fuse

[patch] Initial patch: write max PAGESIZE bytes to /dev/fuse

bug-1074023.patch (text/plain), 1.74 KB, created by Niels de Vos on 2014-03-09 13:03:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niels de Vos

Created: 2014-03-09 13:03:20 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
>index edeb345..3342d3f 100644
>--- a/xlators/mount/fuse/src/fuse-bridge.c
>+++ b/xlators/mount/fuse/src/fuse-bridge.c
>@@ -253,12 +253,17 @@ static int
> send_fuse_data (xlator_t *this, fuse_in_header_t *finh, void *data, size_t size)
> {
>         struct fuse_out_header fouh = {0, };
>-        struct iovec iov_out[2];
>+        size_t sz = ((fuse_private_t*) this->private)->pagesize;
>+        int count = size / sz + 1;
>+        struct iovec iov_out[count + 1];
>+	int i;
> 
>         fouh.error = 0;
>         iov_out[0].iov_base = &fouh;
>-        iov_out[1].iov_base = data;
>-        iov_out[1].iov_len = size;
>+        for (i = 1; i <= count; i++) {
>+                iov_out[i].iov_base = data + (sz * (i - 1));
>+                iov_out[i].iov_len = (i == count ? size % sz : sz);
>+        }
> 
>         return send_fuse_iov (this, finh, iov_out, 2);
> }
>@@ -6100,6 +6105,7 @@ init (xlator_t *this_xl)
>         priv->fd = -1;
>         priv->revchan_in = -1;
>         priv->revchan_out = -1;
>+        priv->pagesize = sysconf (_SC_PAGESIZE);
> 
>         /* get options from option dictionary */
>         ret = dict_get_str (options, ZR_MOUNTPOINT_OPT, &value_string);
>diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h
>index 909dfeb..83dcd12 100644
>--- a/xlators/mount/fuse/src/fuse-bridge.h
>+++ b/xlators/mount/fuse/src/fuse-bridge.h
>@@ -108,6 +108,9 @@ struct fuse_private {
>         pthread_mutex_t      fuse_dump_mutex;
>         int                  fuse_dump_fd;
> 
>+        /* writes to /dev/fuse should exceed PAGESIZE */
>+        size_t               pagesize;
>+
>         glusterfs_graph_t   *next_graph;
>         xlator_t            *active_subvol;
>

Actions: View | Diff

Attachments on bug 1074023: 872404 | 872408 | 878702