From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Daeho Jeong <daeho43@gmail.com>
Cc: Daeho Jeong <daehojeong@google.com>,
kernel-team@android.com, linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net
Subject: Re: [f2fs-dev] [PATCH] f2fs-tools: fall back to the original version check when clock_gettime is not supported
Date: Tue, 28 Sep 2021 13:58:58 -0700 [thread overview]
Message-ID: <YVOCEn9xHmHmJdDI@google.com> (raw)
In-Reply-To: <20210928204658.2230524-1-daeho43@gmail.com>
Merged to address android build breakage.
On 09/28, Daeho Jeong wrote:
> From: Daeho Jeong <daehojeong@google.com>
>
> In lower versions than macOS 10.12, they don't support clock_gettime
> function. It breaks the build, so we need to fall back to the original
> kernel version check algorithm, in that case.
>
> Signed-off-by: Daeho Jeong <daehojeong@google.com>
> ---
> fsck/mount.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/fsck/mount.c b/fsck/mount.c
> index 7c4c681..c928a15 100644
> --- a/fsck/mount.c
> +++ b/fsck/mount.c
> @@ -975,6 +975,16 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr)
> MSG(0, "Info: MKFS version\n \"%s\"\n", c.init_version);
> MSG(0, "Info: FSCK version\n from \"%s\"\n to \"%s\"\n",
> c.sb_version, c.version);
> +#if defined(__APPLE__)
> + if (!c.no_kernel_check &&
> + memcmp(c.sb_version, c.version, VERSION_NAME_LEN)) {
> + c.auto_fix = 0;
> + c.fix_on = 1;
> + memcpy(sbi->raw_super->version,
> + c.version, VERSION_NAME_LEN);
> + update_superblock(sbi->raw_super, SB_MASK(sb_addr));
> + }
> +#else
> if (!c.no_kernel_check) {
> struct timespec t;
> u32 prev_time, cur_time, time_diff;
> @@ -1007,6 +1017,7 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr)
> update_superblock(sbi->raw_super, SB_MASK(sb_addr));
> }
> out:
> +#endif
> print_sb_state(sbi->raw_super);
> return 0;
> }
> --
> 2.33.0.685.g46640cef36-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: Jaegeuk Kim <jaegeuk@kernel.org>
To: Daeho Jeong <daeho43@gmail.com>
Cc: linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com,
Daeho Jeong <daehojeong@google.com>
Subject: Re: [PATCH] f2fs-tools: fall back to the original version check when clock_gettime is not supported
Date: Tue, 28 Sep 2021 13:58:58 -0700 [thread overview]
Message-ID: <YVOCEn9xHmHmJdDI@google.com> (raw)
In-Reply-To: <20210928204658.2230524-1-daeho43@gmail.com>
Merged to address android build breakage.
On 09/28, Daeho Jeong wrote:
> From: Daeho Jeong <daehojeong@google.com>
>
> In lower versions than macOS 10.12, they don't support clock_gettime
> function. It breaks the build, so we need to fall back to the original
> kernel version check algorithm, in that case.
>
> Signed-off-by: Daeho Jeong <daehojeong@google.com>
> ---
> fsck/mount.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/fsck/mount.c b/fsck/mount.c
> index 7c4c681..c928a15 100644
> --- a/fsck/mount.c
> +++ b/fsck/mount.c
> @@ -975,6 +975,16 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr)
> MSG(0, "Info: MKFS version\n \"%s\"\n", c.init_version);
> MSG(0, "Info: FSCK version\n from \"%s\"\n to \"%s\"\n",
> c.sb_version, c.version);
> +#if defined(__APPLE__)
> + if (!c.no_kernel_check &&
> + memcmp(c.sb_version, c.version, VERSION_NAME_LEN)) {
> + c.auto_fix = 0;
> + c.fix_on = 1;
> + memcpy(sbi->raw_super->version,
> + c.version, VERSION_NAME_LEN);
> + update_superblock(sbi->raw_super, SB_MASK(sb_addr));
> + }
> +#else
> if (!c.no_kernel_check) {
> struct timespec t;
> u32 prev_time, cur_time, time_diff;
> @@ -1007,6 +1017,7 @@ int validate_super_block(struct f2fs_sb_info *sbi, enum SB_ADDR sb_addr)
> update_superblock(sbi->raw_super, SB_MASK(sb_addr));
> }
> out:
> +#endif
> print_sb_state(sbi->raw_super);
> return 0;
> }
> --
> 2.33.0.685.g46640cef36-goog
next prev parent reply other threads:[~2021-09-28 20:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 20:46 [f2fs-dev] [PATCH] f2fs-tools: fall back to the original version check when clock_gettime is not supported Daeho Jeong
2021-09-28 20:46 ` Daeho Jeong
2021-09-28 20:58 ` Jaegeuk Kim [this message]
2021-09-28 20:58 ` Jaegeuk Kim
2021-10-13 15:22 ` [f2fs-dev] " Chao Yu
2021-10-13 15:22 ` Chao Yu
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=YVOCEn9xHmHmJdDI@google.com \
--to=jaegeuk@kernel.org \
--cc=daeho43@gmail.com \
--cc=daehojeong@google.com \
--cc=kernel-team@android.com \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.