configure: use AC_SYS_LARGEFILE
PATCH 1/3 configure: use AC_SYS_LARGEFILE
The autoconf macro AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS=64 where necessary to ensure that off_t and all interfaces using off_t are 64bit, even on 32bit systems.
--- configure.ac | 2 ++ 1 file changed, 2 insertions(+)
configure.ac +2 -0
@@ -13,6 +13,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([foreign -Wall]) +AC_SYS_LARGEFILE + # Checks for programs. AM_PROG_AR AC_PROG_CC
Signature · 1 line
2.38.1
PATCH 2/3 erofs_fs.h: Make LFS mandatory for all usecases
erosfs depend on the consistent use of a 64bit offset
type, force downstreams to use transparent LFS (_FILE_OFFSET_BITS=64), so that it becomes impossible for them to use 32bit interfaces.
include autoconf'ed config.h to get definition of _FILE_OFFSET_BITS which was detected by configure. This header needs to be included before any system headers are included to ensure they see the correct definition of _FILE_OFFSET_BITS for the platform
--- dump/main.c | 1 + fsck/main.c | 1 + include/erofs/internal.h | 1 + include/erofs_fs.h | 6 ++++++ lib/Makefile.am | 2 +- mkfs/main.c | 1 + 6 files changed, 11 insertions(+), 1 deletion(-)
dump/main.c +1 -0
@@ -6,6 +6,7 @@* Guo Xuenan <[email protected]> */ #define _GNU_SOURCE +#include "config.h" #include <stdlib.h> #include <getopt.h> #include <time.h>
fsck/main.c +1 -0
@@ -3,6 +3,7 @@* Copyright 2021 Google LLC * Author: Daeho Jeong <[email protected]> */ +#include "config.h" #include <stdlib.h> #include <getopt.h> #include <time.h>
include/erofs/internal.h +1 -0
@@ -12,6 +12,7 @@ extern "C" {#endif +#include <config.h> #include "list.h" #include "err.h"
include/erofs_fs.h +6 -0
@@ -9,6 +9,8 @@#ifndef __EROFS_FS_H#define __EROFS_FS_H +#include <sys/types.h> +#define EROFS_SUPER_MAGIC_V1 0xE0F5E1E2#define EROFS_SUPER_OFFSET 1024
@@ -410,6 +412,10 @@ enum {#define EROFS_NAME_LEN 255 + +/* make sure that any user of the erofs headers has atleast 64bit off_t type */ +extern int eros_assert_largefile[sizeof (off_t)-8 ]; +/* check the EROFS on-disk layout strictly at compile time */ static inline void erofs_check_ondisk_layout_definitions (void ) {
lib/Makefile.am +1 -1
@@ -28,7 +28,7 @@ noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c -liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include +liberofs_la_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir)/include -include config.h if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS} liberofs_la_SOURCES += compressor_lz4.c
mkfs/main.c +1 -0
@@ -5,6 +5,7 @@* Created by Li Guifu <[email protected]> */ #define _GNU_SOURCE +#include "config.h" #include <time.h> #include <sys/time.h> #include <stdlib.h>
Signature · 1 line
2.38.1
Re: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Hi Khem,
Quoted 1 line · Khem Raj
erosfs depend on the consistent use of a 64bit offset
Thanks for your patch!
^ erofs
Quoted 10 lines
type, force downstreams to use transparent LFS (_FILE_OFFSET_BITS=64), so that it becomes impossible for them to use 32bit interfaces.
include autoconf'ed
config.hto get definition of_FILE_OFFSET_BITSwhich was detected by configure. This header needs to be included before any system headers are included to ensure they see the correct definition of_FILE_OFFSET_BITSfor the platformSigned-off-by Khem Raj <[email protected]>---
...
include/erofs/internal.h extern "C" · line 15
Quoted 9 lines
include/erofs/internal.h +1
-0@@ -12,6 +12,7 @@ extern "C" {#endif +#include <config.h>
could we use alternative way? since I'd like to make include/ as liberofs later, and "config.h" autoconf seems weird to me...
include/erofs_fs.h line 12
Quoted 12 lines
include/erofs/internal.h +0
-0#include "list.h" #include "err.h" include/erofs_fs.h +1
-0@@ -9,6 +9,8 @@#ifndef __EROFS_FS_H#define __EROFS_FS_H +#include <sys/types.h>
Could you give more hints why we need this here?
include/erofs_fs.h enum { · line 417
Quoted 11 lines
include/erofs_fs.h +4
-0+#define EROFS_SUPER_MAGIC_V1 0xE0F5E1E2#define EROFS_SUPER_OFFSET 1024@@ -410,6 +412,10 @@ enum {#define EROFS_NAME_LEN 255 + +/* make sure that any user of the erofs headers has atleast 64bit off_t type */ +extern int eros_assert_largefile[sizeof (off_t)-8 ];
erofs? also you could add this into erofs/internal.h...
This file is just the on-disk definition...
Quoted 9 lines
include/erofs_fs.h +1
-0+/* check the EROFS on-disk layout strictly at compile time */ static inline void erofs_check_ondisk_layout_definitions (void ) {lib/Makefile.am +0
-0
lib/Makefile.am noinst_HEADERS += compressor.h · line 31
Quoted 5 lines
lib/Makefile.am +1
-1@@ -28,7 +28,7 @@ noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c -liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include +liberofs_la_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir)/include -include config.h
same here too...
Thanks,
Gao Xiang
Quoted 18 lines
lib/Makefile.am +0
-0if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS} liberofs_la_SOURCES += compressor_lz4.cmkfs/main.c +1
-0@@ -5,6 +5,7 @@* Created by Li Guifu <[email protected]> */ #define _GNU_SOURCE +#include "config.h" #include <time.h> #include <sys/time.h> #include <stdlib.h> Signature · 1 line
2.38.1
Re: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Quoted 9 lines · Gao Xiang
Hi Khem,
Quoted 1 line · Khem Raj
erosfs depend on the consistent use of a 64bit offset
Thanks for your patch!
^ erofs
Done in v2
Quoted 22 lines
Quoted 11 lines
type, force downstreams to use transparent LFS (_FILE_OFFSET_BITS=64), so that it becomes impossible for them to use 32bit interfaces.
include autoconf'ed
config.hto get definition of_FILE_OFFSET_BITSwhich was detected by configure. This header needs to be included before any system headers are included to ensure they see the correct definition of_FILE_OFFSET_BITSfor the platformSigned-off-by Khem Raj <[email protected]>---
...
Quoted 8 lines
include/erofs/internal.h +0
-0@@ -12,6 +12,7 @@ extern "C" {#endif
Quoted 5 lines
include/erofs/internal.h extern "C" · line 15
Quoted 1 line
include/erofs/internal.h +1
-0+#include <config.h> could we use alternative way? since I'd like to make
include/as liberofs later, and "config.h" autoconf seems weird to me...
I am using the AC_SYS_LARGEFILE macro from autoconf to enable support for largefile support during configure. configure will generate config.h in build dir which
will contain the essential macros which we use e.g. _FILE_OFFSET_BITS defined to right values. Alternate way is to pass it _always_ or demand it to be passed from
user. Which in a way it will do with internal.h check added in this series. I am fine
if you do not want to depend on autoconf support to enable LFS. Let me know.
Quoted 11 lines
Quoted 11 lines
include/erofs/internal.h +0
-0#include "list.h" #include "err.h" include/erofs_fs.h +0
-0@@ -9,6 +9,8 @@#ifndef __EROFS_FS_H#define __EROFS_FS_H
Quoted 3 lines
include/erofs_fs.h line 12
Quoted 1 line
include/erofs_fs.h +1
-0+#include <sys/types.h> Could you give more hints why we need this here?
Its needed to get off_t defined, I have added a comment here in v2
Quoted 9 lines
Quoted 9 lines
include/erofs_fs.h +1
-0+#define EROFS_SUPER_MAGIC_V1 0xE0F5E1E2#define EROFS_SUPER_OFFSET 1024@@ -410,6 +412,10 @@ enum {#define EROFS_NAME_LEN 255
Quoted 7 lines
include/erofs_fs.h enum { · line 417
Quoted 3 lines
include/erofs_fs.h +3
-0+ +/* make sure that any user of the erofs headers has atleast 64bit off_t type */ +extern int eros_assert_largefile[sizeof (off_t)-8 ];erofs? also you could add this into
erofs/internal.h...This file is just the on-disk definition...
yeah moved the check to internal.h in v2
Quoted 17 lines
Quoted 10 lines
include/erofs_fs.h +1
-0+/* check the EROFS on-disk layout strictly at compile time */ static inline void erofs_check_ondisk_layout_definitions (void ) {lib/Makefile.am +0
-0lib/Makefile.am noinst_HEADERS += compressor.h · line 31
Quoted 5 lines
lib/Makefile.am +1
-1@@ -28,7 +28,7 @@ noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c -liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include +liberofs_la_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir)/include -include config.hsame here too...
as said above if we are ok to pass it always then we can add -D _FILE_OFFSET_BITS=64 via toplevel Makefile.am
it will only be needed on 32bit systems though, so maybe we do not define it and demand it from users via CFLAGS
if they compile it for 32bit systems.
Quoted 22 lines
Thanks,
Gao XiangQuoted 18 lines
lib/Makefile.am +0
-0if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS} liberofs_la_SOURCES += compressor_lz4.cmkfs/main.c +1
-1@@ -5,6 +5,7 @@* Created by Li Guifu <[email protected]> */ #define _GNU_SOURCE +#include "config.h" #include <time.h> #include <sys/time.h> #include <stdlib.h> --2.38.1
Re: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Hi Khem,
Quoted 62 lines · Khem Raj
Quoted 9 lines · Gao Xiang
Hi Khem,
Quoted 1 line · Khem Raj
erosfs depend on the consistent use of a 64bit offset
Thanks for your patch!
^ erofs
Done in v2
Quoted 22 lines
Quoted 11 lines
type, force downstreams to use transparent LFS (_FILE_OFFSET_BITS=64), so that it becomes impossible for them to use 32bit interfaces.
include autoconf'ed
config.hto get definition of_FILE_OFFSET_BITSwhich was detected by configure. This header needs to be included before any system headers are included to ensure they see the correct definition of_FILE_OFFSET_BITSfor the platformSigned-off-by Khem Raj <[email protected]>---
...
Quoted 8 lines
include/erofs/internal.h +0
-0@@ -12,6 +12,7 @@ extern "C" {#endif Quoted 5 lines
include/erofs/internal.h extern "C" · line 15
Quoted 1 line
include/erofs/internal.h +1
-0+#include <config.h> could we use alternative way? since I'd like to make
include/as liberofs later, and "config.h" autoconf seems weird to me...I am using the
AC_SYS_LARGEFILEmacro from autoconf to enable support for largefile support during configure. configure will generateconfig.hin build dir which
will contain the essential macros which we use e.g._FILE_OFFSET_BITSdefined to right values. Alternate way is to pass it _always_ or demand it to be passed from
user. Which in a way it will do withinternal.hcheck added in this series. I am fine
if you do not want to depend on autoconf support to enable LFS. Let me know.Quoted 11 lines
Quoted 11 lines
include/erofs/internal.h +0
-0#include "list.h" #include "err.h" include/erofs_fs.h +0
-0@@ -9,6 +9,8 @@#ifndef __EROFS_FS_H#define __EROFS_FS_H
Quoted 6 lines
Quoted 3 lines
include/erofs_fs.h line 12
Quoted 1 line
include/erofs_fs.h +1
-0+#include <sys/types.h> Could you give more hints why we need this here?
Its needed to get
off_tdefined, I have added a comment here in v2i
but we don't use off_t in erofs_fs.h?
Quoted 37 lines
Quoted 9 lines
Quoted 9 lines
include/erofs_fs.h +1
-0+#define EROFS_SUPER_MAGIC_V1 0xE0F5E1E2#define EROFS_SUPER_OFFSET 1024@@ -410,6 +412,10 @@ enum {#define EROFS_NAME_LEN 255Quoted 7 lines
include/erofs_fs.h enum { · line 417
Quoted 3 lines
include/erofs_fs.h +3
-0+ +/* make sure that any user of the erofs headers has atleast 64bit off_t type */ +extern int eros_assert_largefile[sizeof (off_t)-8 ];erofs? also you could add this into
erofs/internal.h...This file is just the on-disk definition...
yeah moved the check to
internal.hin v2Quoted 17 lines
Quoted 10 lines
include/erofs_fs.h +1
-0+/* check the EROFS on-disk layout strictly at compile time */ static inline void erofs_check_ondisk_layout_definitions (void ) {lib/Makefile.am +0
-0lib/Makefile.am noinst_HEADERS += compressor.h · line 31
Quoted 5 lines
lib/Makefile.am +1
-1@@ -28,7 +28,7 @@ noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c -liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include +liberofs_la_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir)/include -include config.hsame here too...
Quoted 6 lines
as said above if we are ok to pass it always then we can add -D _FILE_OFFSET_BITS=64 via toplevel Makefile.am
it will only be needed on 32bit systems though, so maybe we do not define it and demand it from users via CFLAGS
if they compile it for 32bit systems.
I think use -D _FILE_OFFSET_BITS=64 would be a better choice...
Thanks,
Gao Xiang
Re: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Quoted 66 lines · Gao Xiang
Hi Khem,
Quoted 62 lines · Khem Raj
Quoted 9 lines · Gao Xiang
Hi Khem,
Quoted 1 line · Khem Raj
erosfs depend on the consistent use of a 64bit offset
Thanks for your patch!
^ erofs
Done in v2
Quoted 22 lines
Quoted 11 lines
type, force downstreams to use transparent LFS (_FILE_OFFSET_BITS=64), so that it becomes impossible for them to use 32bit interfaces.
include autoconf'ed
config.hto get definition of_FILE_OFFSET_BITSwhich was detected by configure. This header needs to be included before any system headers are included to ensure they see the correct definition of_FILE_OFFSET_BITSfor the platformSigned-off-by Khem Raj <[email protected]>---
...
Quoted 8 lines
include/erofs/internal.h +0
-0@@ -12,6 +12,7 @@ extern "C" {#endif Quoted 5 lines
include/erofs/internal.h extern "C" · line 15
Quoted 1 line
include/erofs/internal.h +1
-0+#include <config.h> could we use alternative way? since I'd like to make
include/as liberofs later, and "config.h" autoconf seems weird to me...I am using the
AC_SYS_LARGEFILEmacro from autoconf to enable support for largefile support during configure. configure will generateconfig.hin build dir which
will contain the essential macros which we use e.g._FILE_OFFSET_BITSdefined to right values. Alternate way is to pass it _always_ or demand it to be passed from
user. Which in a way it will do withinternal.hcheck added in this series. I am fine
if you do not want to depend on autoconf support to enable LFS. Let me know.Quoted 11 lines
Quoted 11 lines
include/erofs/internal.h +0
-0#include "list.h" #include "err.h" include/erofs_fs.h +0
-0@@ -9,6 +9,8 @@#ifndef __EROFS_FS_H#define __EROFS_FS_H
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
include/erofs_fs.h line 12
Quoted 1 line
include/erofs_fs.h +1
-0+#include <sys/types.h> Could you give more hints why we need this here?
Its needed to get
off_tdefined, I have added a comment here in v2ibut we don't use
off_tinerofs_fs.h?
the new check I added does use it.
Quoted 38 lines
Quoted 38 lines
Quoted 10 lines
Quoted 10 lines
include/erofs_fs.h +1
-0+#define EROFS_SUPER_MAGIC_V1 0xE0F5E1E2#define EROFS_SUPER_OFFSET 1024@@ -410,6 +412,10 @@ enum {#define EROFS_NAME_LEN 255Quoted 7 lines
include/erofs_fs.h enum { · line 417
Quoted 3 lines
include/erofs_fs.h +3
-0+ +/* make sure that any user of the erofs headers has atleast 64bit off_t type */ +extern int eros_assert_largefile[sizeof (off_t)-8 ];erofs? also you could add this into
erofs/internal.h...This file is just the on-disk definition...
yeah moved the check to
internal.hin v2Quoted 17 lines
Quoted 10 lines
include/erofs_fs.h +1
-0+/* check the EROFS on-disk layout strictly at compile time */ static inline void erofs_check_ondisk_layout_definitions (void ) {lib/Makefile.am +0
-0lib/Makefile.am noinst_HEADERS += compressor.h · line 31
Quoted 5 lines
lib/Makefile.am +1
-1@@ -28,7 +28,7 @@ noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c -liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include +liberofs_la_CFLAGS = -Wall -I$(top_builddir) -I$(top_srcdir)/include -include config.hsame here too...
Quoted 9 lines
Quoted 6 lines
as said above if we are ok to pass it always then we can add -D _FILE_OFFSET_BITS=64 via toplevel Makefile.am
it will only be needed on 32bit systems though, so maybe we do not define it and demand it from users via CFLAGS
if they compile it for 32bit systems.I think use -D _FILE_OFFSET_BITS=64 would be a better choice...
OK I will rework it in v3.
Quoted 2 lines
Thanks,
Gao Xiang
Re: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Hi Khem,
On Sat, Dec 10, 2022 at 11:49:25AM -0800, Khem Raj wrote:
...
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
as said above if we are ok to pass it always then we can add -D _FILE_OFFSET_BITS=64 via toplevel Makefile.am
it will only be needed on 32bit systems though, so maybe we do not define it and demand it from users via CFLAGS
if they compile it for 32bit systems.
Quoted 4 lines
Quoted 2 lines
I think use -D _FILE_OFFSET_BITS=64 would be a better choice...
OK I will rework it in v3.
Do you still have some interest to work on this?
(I'm about to release erofs-utils 1.6 in a month.. It would be helpful
to clean up such stuff in this version.)
Thanks,
Gao Xiang
Quoted 3 lines
Quoted 3 lines
Thanks,
Gao Xiang
Re: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Quoted 15 lines · Gao Xiang
Hi Khem,
On Sat, Dec 10, 2022 at 11:49:25AM -0800, Khem Raj wrote:
...
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
as said above if we are ok to pass it always then we can add -D _FILE_OFFSET_BITS=64 via toplevel Makefile.am
it will only be needed on 32bit systems though, so maybe we do not define it and demand it from users via CFLAGS
if they compile it for 32bit systems.
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
I think use -D _FILE_OFFSET_BITS=64 would be a better choice...
OK I will rework it in v3.
Do you still have some interest to work on this?
(I'm about to release erofs-utils 1.6 in a month.. It would be helpful
to clean up such stuff in this version.)
Yes, I am testing a build of v3 today, and I will send out the v3 patchset soon after that.
Quoted 7 lines
Thanks,
Gao XiangQuoted 3 lines
Quoted 3 lines
Thanks,
Gao Xiang
PATCH 3/3 erosfs: replace [l]stat64 by equivalent [l]stat
In reply to Khem Raj--- lib/inode.c | 10 +++++----- lib/xattr.c | 4 ++-- mkfs/main.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
lib/inode.c +5 -5
@@ -773,7 +773,7 @@ static u32 erofs_new_encode_dev(dev_t dev)#ifdef WITH_ANDROID int erofs_droid_inode_fsconfig (struct erofs_inode *inode, -struct stat64 *st, +struct stat *st,const char *path) {/* filesystem_config does not preserve file type bits */
@@ -818,7 +818,7 @@ int erofs_droid_inode_fsconfig(struct erofs_inode *inode, }#else static int erofs_droid_inode_fsconfig (struct erofs_inode *inode, -struct stat64 *st, +struct stat *st,const char *path) {return 0 ;
@@ -826,7 +826,7 @@ static int erofs_droid_inode_fsconfig(struct erofs_inode *inode,#endif static int erofs_fill_inode (struct erofs_inode *inode, -struct stat64 *st, +struct stat *st,const char *path) {int err =erofs_droid_inode_fsconfig (inode, st, path);
@@ -910,7 +910,7 @@ static struct erofs_inode *erofs_new_inode(void)/* get the inode from the (source) path */ static struct erofs_inode *erofs_iget_from_path (const char *path,bool is_src) { -struct stat64 st; +struct stat st;struct erofs_inode *inode;int ret;
@@ -918,7 +918,7 @@ static struct erofs_inode *erofs_iget_from_path(const char *path, bool is_src)if (!is_src)return ERR_PTR (-EINVAL ); - ret =lstat64 (path, &st); + ret =lstat (path, &st);if (ret)return ERR_PTR (-errno);
lib/xattr.c +2 -2
@@ -467,7 +467,7 @@ static int erofs_count_all_xattrs_from_path(const char *path) {int ret;DIR *_dir; -struct stat64 st; +struct stat st; _dir =opendir (path);if (!_dir) {
@@ -502,7 +502,7 @@ static int erofs_count_all_xattrs_from_path(const char *path) goto fail; } - ret =lstat64 (buf, &st); + ret =lstat (buf, &st);if (ret) { ret = -errno; goto fail;
mkfs/main.c +2 -2
@@ -582,7 +582,7 @@ int main(int argc, char **argv)struct erofs_buffer_head *sb_bh;struct erofs_inode *root_inode;erofs_nid_t root_nid; -struct stat64 st; +struct stat st;erofs_blk_t nblocks;struct timeval t;char uuid_str[37 ] ="not available" ;
@@ -610,7 +610,7 @@ int main(int argc, char **argv)return 1 ; } - err =lstat64 (cfg.c_src_path, &st); + err =lstat (cfg.c_src_path, &st);if (err)return 1 ;if (!S_ISDIR (st.st_mode)) {
Signature · 1 line
2.38.1