From 86487dfb7f51f552bb27a16568a612f14221cd49 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 20 May 2015 22:34:44 +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: 1222150 Signed-off-by: Niels de Vos Tested-by: Cyril Peponnet Reviewed-on: http://review.gluster.org/10884 Tested-by: Gluster Build System --- xlators/mount/fuse/src/fuse-helpers.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'xlators/mount/fuse/src/fuse-helpers.c') diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index 6584dcfb6fc..e5e5ca1b329 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -450,9 +450,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