From: Khem Raj <raj.khem@gmail.com>
To: linux-erofs@lists.ozlabs.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases
Date: Thu, 8 Dec 2022 00:53:34 -0800 [thread overview]
Message-ID: <20221208085335.2884608-2-raj.khem@gmail.com> (raw)
In-Reply-To: <20221208085335.2884608-1-raj.khem@gmail.com>
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 | 1 +
include/erofs_fs.h | 6 ++++++
lib/Makefile.am | 2 +-
mkfs/main.c | 1 +
6 files changed, 11 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..9cc20a8 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"
diff --git a/include/erofs_fs.h b/include/erofs_fs.h
index 08f9761..a3bd93c 100644
--- a/include/erofs_fs.h
+++ b/include/erofs_fs.h
@@ -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)
{
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
next prev parent reply other threads:[~2022-12-08 8:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-08 8:53 [PATCH 1/3] configure: use AC_SYS_LARGEFILE Khem Raj
2022-12-08 8:53 ` Khem Raj [this message]
2022-12-08 14:18 ` [PATCH 2/3] erofs_fs.h: Make LFS mandatory for all usecases Gao Xiang
2022-12-10 2:20 ` Khem Raj
2022-12-10 15:03 ` Gao Xiang
2022-12-10 19:49 ` Khem Raj
2022-12-15 4:12 ` Gao Xiang
2022-12-15 5:26 ` Khem Raj
2022-12-08 8:53 ` [PATCH 3/3] erosfs: replace [l]stat64 by equivalent [l]stat Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221208085335.2884608-2-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=linux-erofs@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox