Attachment 878702 Details for Bug 1074023 – call send_fuse_data multiple times in readdir callback if neccessary

[patch] call send_fuse_data multiple times in readdir callback if neccessary

file_1074023.txt (text/plain), 1.66 KB, created by thomas higdon on 2014-03-25 21:38:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: thomas higdon

Created: 2014-03-25 21:38:05 UTC

Size: 1.66 KB

patch

obsolete

>--- glusterfs-3.4.2-orig/xlators/mount/fuse/src/fuse-bridge.c	2014-01-03 06:17:12.000000000 -0500
>+++ glusterfs-3.4.2/xlators/mount/fuse/src/fuse-bridge.c	2014-03-25 16:21:55.000000000 -0400
>@@ -2570,7 +2570,7 @@
> 	fuse_state_t *state = NULL;
> 	fuse_in_header_t *finh = NULL;
> 	int           size = 0;
>-	char         *buf = NULL;
>+        char         *orig_buf = NULL, *buf = NULL;
> 	gf_dirent_t  *entry = NULL;
> 	struct fuse_direntplus *fde = NULL;
> 	struct fuse_entry_out *feo = NULL;
>@@ -2589,10 +2589,6 @@
> 		goto out;
> 	}
> 
>-	gf_log ("glusterfs-fuse", GF_LOG_TRACE,
>-		"%"PRIu64": READDIRP => %d/%"GF_PRI_SIZET",%"PRId64,
>-		frame->root->unique, op_ret, state->size, state->off);
>-
> 	list_for_each_entry (entry, &entries->list, list) {
> 		size += FUSE_DIRENT_ALIGN (FUSE_NAME_OFFSET_DIRENTPLUS +
> 					   strlen (entry->d_name));
>@@ -2612,6 +2608,7 @@
> 		goto out;
> 	}
> 
>+        orig_buf = buf;
> 	size = 0;
> 	list_for_each_entry (entry, &entries->list, list) {
> 		inode_t *linked_inode;
>@@ -2623,6 +2620,13 @@
> 		fde->dirent.type = entry->d_type;
> 		fde->dirent.namelen = strlen (entry->d_name);
> 		strncpy (fde->dirent.name, entry->d_name, fde->dirent.namelen);
>+
>+                if (size + FUSE_DIRENTPLUS_SIZE (fde) > sysconf(_SC_PAGESIZE)) {
>+                    send_fuse_data (this, finh, buf, size);
>+                    buf += size;
>+                    size = 0;
>+                }
>+
> 		size += FUSE_DIRENTPLUS_SIZE (fde);
> 
> 		if (!entry->inode)
>@@ -2657,8 +2661,9 @@
> 	send_fuse_data (this, finh, buf, size);
> out:
> 	free_fuse_state (state);
>+
> 	STACK_DESTROY (frame->root);
>-	GF_FREE (buf);
>+	GF_FREE (orig_buf);
> 	return 0;
> 
> }

Actions: View | Diff

Attachments on bug 1074023: 872404 | 872408 | 878702