andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fuse: minor improvements for readdir(plus)

Browse Source 
Instead of using 'int' for the sizes, use a 'size_t' as it is more
correct. Save the size of a fuse_dirent in a temporary variable so that
strlen() on the filename is called fewer times.

Also correcting some typos in comments.

Change-Id: Ic62d9d729a86a1a6a53ed1354fce153bac01d860
BUG: 1074023
Reported-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/7547
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
Niels de Vos 2014-04-24 13:38:31 +02:00 committed by Anand Avati
parent f77e5b6ebe
commit 76ab97169f
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
xlators/mount/fuse/src/fuse-bridge.c
View File

@ -2553,8 +2553,8 @@ fuse_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
fuse_state_t *state = NULL;
fuse_in_header_t *finh = NULL;
int size = 0;
int max_size = 0;
size_t size = 0;
size_t max_size = 0;
char *buf = NULL;
gf_dirent_t *entry = NULL;
struct fuse_dirent *fde = NULL;
@ -2580,18 +2580,18 @@ fuse_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
frame->root->unique, op_ret, state->size, state->off);
list_for_each_entry (entry, &entries->list, list) {
max_size += FUSE_DIRENT_ALIGN (FUSE_NAME_OFFSET +
strlen (entry->d_name));
size_t fde_size = FUSE_DIRENT_ALIGN (FUSE_NAME_OFFSET +
strlen (entry->d_name));
max_size += fde_size;
if (max_size > state->size) {
/* we received to many entries to fit in the request */
max_size -= FUSE_DIRENT_ALIGN (FUSE_NAME_OFFSET +
strlen (entry->d_name));
/* we received too many entries to fit in the reply */
max_size -= fde_size;
break;
}
}
if (max_size <= 0) {
if (max_size == 0) {
send_fuse_data (this, finh, 0, 0);
goto out;
}
@ -2666,8 +2666,8 @@ fuse_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
{
fuse_state_t *state = NULL;
fuse_in_header_t *finh = NULL;
int max_size = 0;
int size = 0;
size_t max_size = 0;
size_t size = 0;
char *buf = NULL;
gf_dirent_t *entry = NULL;
struct fuse_direntplus *fde = NULL;
@ -2692,19 +2692,18 @@ fuse_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
frame->root->unique, op_ret, state->size, state->off);
list_for_each_entry (entry, &entries->list, list) {
max_size += FUSE_DIRENT_ALIGN (FUSE_NAME_OFFSET_DIRENTPLUS +
strlen (entry->d_name));
size_t fdes = FUSE_DIRENT_ALIGN (FUSE_NAME_OFFSET_DIRENTPLUS +
strlen (entry->d_name));
max_size += fdes;
if (max_size > state->size) {
/* we received to many entries to fit in the reply */
max_size -= FUSE_DIRENT_ALIGN (
FUSE_NAME_OFFSET_DIRENTPLUS +
strlen (entry->d_name));
/* we received too many entries to fit in the reply */
max_size -= fdes;
break;
}
}
if (max_size <= 0) {
if (max_size == 0) {
send_fuse_data (this, finh, 0, 0);
goto out;
}