Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git

Also cherry-picked some bits of dev-slices.

diff --git a/lib/lfs.h b/lib/lfs.h
index 5aac2363015ac5f22e3b0950e1679b3ce073bb0a..274b72a743553c5fe239cd56dcd4a764bb8016ab 100644 (file)
--- a/lib/lfs.h
+++ b/lib/lfs.h
@@ -24,6 +24,7 @@
 #define sh_pread pread64
 #define sh_pwrite pwrite64
 #define sh_stat stat64
+#define sh_fstat fstat64
 typedef struct stat64 sh_stat_t;
 
 #else  /* !CONFIG_LFS */
@@ -35,6 +36,7 @@ typedef struct stat64 sh_stat_t;
 #define sh_pread pread
 #define sh_pwrite pwrite
 #define sh_stat stat
+#define sh_fstat fstat
 typedef struct stat sh_stat_t;
 
 #endif /* !CONFIG_LFS */