From bb315cb180c3547218b5ed581d38e76aec74cf94 Mon Sep 17 00:00:00 2001 From: Anand Avati Date: Thu, 13 May 2010 12:53:25 +0000 Subject: fuse, dht: use readdir by default. dht - switch over to readdirp based algo if one subvolume is down Signed-off-by: Anand V. Avati Signed-off-by: Anand V. Avati Signed-off-by: Anand V. Avati BUG: 898 (small file performance enhancements) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=898 --- xlators/mount/fuse/src/fuse-bridge.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xlators/mount/fuse/src') diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 1adbddadf68..22973ac5d97 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -2165,7 +2165,6 @@ fuse_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, fde = (struct fuse_dirent *)(buf + size); fde->ino = entry->d_ino; fde->off = entry->d_off; - fde->type = d_type_from_stat (&entry->d_stat); fde->namelen = strlen (entry->d_name); strncpy (fde->name, entry->d_name, fde->namelen); size += FUSE_DIRENT_SIZE (fde); @@ -2201,8 +2200,8 @@ fuse_readdir (xlator_t *this, fuse_in_header_t *finh, void *msg) "%"PRIu64": READDIR (%p, size=%"PRIu32", offset=%"PRId64")", finh->unique, fd, fri->size, fri->offset); - FUSE_FOP (state, fuse_readdir_cbk, GF_FOP_READDIRP, - readdirp, fd, fri->size, fri->offset); + FUSE_FOP (state, fuse_readdir_cbk, GF_FOP_READDIR, + readdir, fd, fri->size, fri->offset); } -- cgit