Commit 22a5cf62 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: Get rid of uneccessary hostfs build trick

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: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7c72df50
......@@ -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 @@ SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
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 $@ $<
......@@ -28,10 +28,7 @@ int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment