Get rid of the grepping for __st_ino in hostfs, since it doesn't work on x86_64
(the grep finds it, but it is ifdefed out), and Al says it's unnecessary
anyway.
Signed-off-by: Jeff Dike <[email protected]>
Index: linux-2.6.11/fs/hostfs/Makefile
===================================================================
--- linux-2.6.11.orig/fs/hostfs/Makefile 2005-03-05 12:07:31.000000000 -0500
+++ linux-2.6.11/fs/hostfs/Makefile 2005-03-05 12:09:15.000000000 -0500
@@ -3,13 +3,6 @@
# Licensed under the GPL
#
-# struct stat64 changed the inode field name between 2.2 and 2.4 from st_ino
-# to __st_ino. It stayed in the same place, so as long as the correct name
-# is used, hostfs compiled on 2.2 should work on 2.4 and vice versa.
-
-STAT64_INO_FIELD := $(shell grep -q __st_ino /usr/include/bits/stat.h && \
- echo __)st_ino
-
hostfs-objs := hostfs_kern.o hostfs_user.o
obj-y =
@@ -20,7 +13,5 @@
USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(SINGLE_OBJS))
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
-USER_CFLAGS += -DSTAT64_INO_FIELD=$(STAT64_INO_FIELD)
-
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
Index: linux-2.6.11/fs/hostfs/hostfs_user.c
===================================================================
--- linux-2.6.11.orig/fs/hostfs/hostfs_user.c 2005-03-05 12:07:31.000000000 -0500
+++ linux-2.6.11/fs/hostfs/hostfs_user.c 2005-03-05 12:09:15.000000000 -0500
@@ -28,10 +28,7 @@
if(lstat64(path, &buf) < 0)
return(-errno);
- /* See the Makefile for why STAT64_INO_FIELD is passed in
- * by the build
- */
- if(inode_out != NULL) *inode_out = buf.STAT64_INO_FIELD;
+ if(inode_out != NULL) *inode_out = buf.st_ino;
if(mode_out != NULL) *mode_out = buf.st_mode;
if(nlink_out != NULL) *nlink_out = buf.st_nlink;
if(uid_out != NULL) *uid_out = buf.st_uid;