* [[PATCH v2 2/3] includes: Make LFS mandatory for all usecases
2022-12-10 2:22 [[PATCH v2 1/3] configure: use AC_SYS_LARGEFILE Khem Raj
@ 2022-12-10 2:22 ` Khem Raj
2022-12-10 2:22 ` [[PATCH v2 3/3] erofs: replace [l]stat64 by equivalent [l]stat Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2022-12-10 2:22 UTC (permalink / raw)
To: linux-erofs; +Cc: Khem Raj
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
dump/main.c | 1 +
fsck/main.c | 1 +
include/erofs/internal.h | 6 ++++++
lib/Makefile.am | 2 +-
mkfs/main.c | 1 +
5 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dump/main.c b/dump/main.c
index 49ff2b7..1b40f2a 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -6,6 +6,7 @@
* Guo Xuenan <guoxuenan@huawei.com>
*/
#define _GNU_SOURCE
+#include "config.h"
#include <stdlib.h>
#include <getopt.h>
#include <time.h>
diff --git a/fsck/main.c b/fsck/main.c
index 5a2f659..82eef93 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -3,6 +3,7 @@
* Copyright 2021 Google LLC
* Author: Daeho Jeong <daehojeong@google.com>
*/
+#include "config.h"
#include <stdlib.h>
#include <getopt.h>
#include <time.h>
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 6a70f11..81fc07b 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -12,6 +12,7 @@ extern "C"
{
#endif
+#include <config.h>
#include "list.h"
#include "err.h"
@@ -21,6 +22,7 @@ typedef unsigned short umode_t;
#include "erofs_fs.h"
#include <fcntl.h>
+#include <sys/types.h> /* for off_t definition */
#ifndef PATH_MAX
#define PATH_MAX 4096 /* # chars in a path name including nul */
@@ -104,6 +106,10 @@ struct erofs_sb_info {
};
};
+
+/* make sure that any user of the erofs headers has atleast 64bit off_t type */
+extern int erofs_assert_largefile[sizeof(off_t)-8];
+
/* global sbi */
extern struct erofs_sb_info sbi;
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3fad357..88400ed 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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
diff --git a/mkfs/main.c b/mkfs/main.c
index d2c9830..0e601d9 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -5,6 +5,7 @@
* Created by Li Guifu <bluce.liguifu@huawei.com>
*/
#define _GNU_SOURCE
+#include "config.h"
#include <time.h>
#include <sys/time.h>
#include <stdlib.h>
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [[PATCH v2 3/3] erofs: replace [l]stat64 by equivalent [l]stat
2022-12-10 2:22 [[PATCH v2 1/3] configure: use AC_SYS_LARGEFILE Khem Raj
2022-12-10 2:22 ` [[PATCH v2 2/3] includes: Make LFS mandatory for all usecases Khem Raj
@ 2022-12-10 2:22 ` Khem Raj
1 sibling, 0 replies; 3+ messages in thread
From: Khem Raj @ 2022-12-10 2:22 UTC (permalink / raw)
To: linux-erofs; +Cc: Khem Raj
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/inode.c | 10 +++++-----
lib/xattr.c | 4 ++--
mkfs/main.c | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/inode.c b/lib/inode.c
index f192510..38003fc 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -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);
diff --git a/lib/xattr.c b/lib/xattr.c
index 71ffe3e..fd0e728 100644
--- a/lib/xattr.c
+++ b/lib/xattr.c
@@ -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;
diff --git a/mkfs/main.c b/mkfs/main.c
index 0e601d9..ca1ac16 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -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)) {
--
2.38.1
^ permalink raw reply related [flat|nested] 3+ messages in thread