From 35ff4c8c99bb0828d3d1a017f9fae25c56bc091a Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 21 May 2015 17:47:33 +0200 Subject: fuse: squash 64-bit inodes in readdirp when enable-ino32 is set The structures returned by readdirp contain the inode 2x. Only one of them was squashed into 32-bits when enable-ino32 is enabled. Backport of: > Change-Id: I33a6d28fb118bb23971f918ffeb983d7f033106e > BUG: 1223889 > Reviewed-on: http://review.gluster.org/10881 > Signed-off-by: Niels de Vos > Tested-by: Cyril Peponnet [on release-3.5] Change-Id: I33a6d28fb118bb23971f918ffeb983d7f033106e BUG: 1223891 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/10883 Tested-by: Gluster Build System Reviewed-by: Raghavendra Bhat --- xlators/mount/fuse/src/fuse-bridge.c | 7 ++++++- xlators/mount/fuse/src/fuse-bridge.h | 3 +++ xlators/mount/fuse/src/fuse-helpers.c | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c index 17335492465..04426dae839 100644 --- a/xlators/mount/fuse/src/fuse-bridge.c +++ b/xlators/mount/fuse/src/fuse-bridge.c @@ -2756,7 +2756,12 @@ fuse_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, fde = (struct fuse_direntplus *)(buf + size); feo = &fde->entry_out; - fde->dirent.ino = entry->d_ino; + + if (priv->enable_ino32) + fde->dirent.ino = GF_FUSE_SQUASH_INO(entry->d_ino); + else + fde->dirent.ino = entry->d_ino; + fde->dirent.off = entry->d_off; fde->dirent.type = entry->d_type; fde->dirent.namelen = strlen (entry->d_name); diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h index d0d4120026b..bf1b77be666 100644 --- a/xlators/mount/fuse/src/fuse-bridge.h +++ b/xlators/mount/fuse/src/fuse-bridge.h @@ -149,6 +149,9 @@ typedef struct fuse_graph_switch_args fuse_graph_switch_args_t; #define FH_TO_FD(fh) ((_FH_TO_FD (fh))?(fd_ref (_FH_TO_FD (fh))):((fd_t *) 0)) +/* Use the same logic as the Linux NFS-client */ +#define GF_FUSE_SQUASH_INO(ino) (((uint32_t) ino) ^ (ino >> 32)) + #define FUSE_FOP(state, ret, op_num, fop, args ...) \ do { \ xlator_t *xl = NULL; \ diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index 315af962d7a..6dd8107fb83 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -455,9 +455,6 @@ fail: return ret; } -/* Use the same logic as the Linux NFS-client */ -#define GF_FUSE_SQUASH_INO(ino) ((uint32_t) ino) ^ (ino >> 32) - /* courtesy of folly */ void gf_fuse_stat2attr (struct iatt *st, struct fuse_attr *fa, gf_boolean_t enable_ino32) -- cgit