commit 21f3da95daed2d0f0c28cc4ef8b1103fbfb7bded
author Andrew Morton <akpm@linux-foundation.org> Sun Jul 15 23:39:50 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Jul 16 09:05:41 2007 -0700
tree 858c61212662b1b476bbdefe0eb8de69328a47db
parent 9ac162521cd9796f44d263a61090634844c719a6

fuse warning fix

gcc-4.3:

fs/fuse/dir.c: In function 'parse_dirfile':
fs/fuse/dir.c:833: warning: cast from pointer to integer of different size
fs/fuse/dir.c:835: warning: cast from pointer to integer of different size

[miklos@szeredi.hu: use offsetof]
Acked-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

include/linux/fuse.h

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 534744e..9fbe9d2 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -339,7 +339,7 @@
 	char name[0];
 };
 
-#define FUSE_NAME_OFFSET ((unsigned) ((struct fuse_dirent *) 0)->name)
+#define FUSE_NAME_OFFSET offsetof(struct fuse_dirent, name)
 #define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
 #define FUSE_DIRENT_SIZE(d) \
 	FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)