From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 434DFC433F5 for ; Sun, 22 May 2022 06:03:22 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nsegP-0002Dj-9I; Sun, 22 May 2022 06:03:17 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nsegN-0002Dd-Vw for linux-f2fs-devel@lists.sourceforge.net; Sun, 22 May 2022 06:03:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2YJVOg3DYp1p518Jxmo9GmErE5roNZogui0twFepFk8=; b=DhaOhGNx2E0+q3D8PZGA0zWlUE OMZmbn2AzdaYlUiR0v3FH3yAkBTjns35djzHhq03g5wDK0Fenxfyd1wCEnN7A7xiWbKGZXA8k77w0 otG59DVEZsZYANJaeWA2cxHWSknpGpInM+NkFP9vogPB4rVBJJUDUa2YSbAGYlm/EegA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=2YJVOg3DYp1p518Jxmo9GmErE5roNZogui0twFepFk8=; b=f g7eJeCRtnJ8m9paaAQpfh1Fh3x/kVJV3bK7hZyoNQEo2XahEcphjWSz7DnAzRMMCN6EVatr139S2v cZDgKTCF1gJxtUNx9AEZrVk5UecJxHOdhlc2QKZATEQUWbiCGhF5h1DMo3MK2wAMRCJBVcul45Xuj J1yZVsSH2UngJ5nU=; Received: from dfw.source.kernel.org ([139.178.84.217]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nsegJ-0002uR-SQ for linux-f2fs-devel@lists.sourceforge.net; Sun, 22 May 2022 06:03:16 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4441660ED5 for ; Sun, 22 May 2022 06:03:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F071C385AA; Sun, 22 May 2022 06:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653199382; bh=gOARO1Q4FueU1XuIVi4p7R4b2tIJTlPclN4zJWSV7CY=; h=From:To:Cc:Subject:Date:From; b=jUq7qTQyK6aJB4BDBnJbY7QATbyxeNvv7IgOFLnvs+am8c+W2T2bRoAh1uwAbM9Y2 P+A+LnZkNlrFj60BOFbOg4Vb9SZl3sJPR3/Li4DWuMpQtmavp1QpF7OQM7lXT/FPV1 puT9vdQfMQH5nZmbi6udoYuHYCsa8+M76We13pVExO28yFWGi3SQmny/w64kDpsnf5 kCuiAo/d8k6pJUYFULhMhS1AxWQ2xY5P929OMO+Mr4x2fyy1K5cTWdforJEg5WHihM hp1VMCz+x49jyAls/KYLodtlPIBIICSgIwud6HqieQY/R/4ya3DZO5xlSXHP7RiY2W pR1Bl7Roe12gQ== From: Jaegeuk Kim To: linux-f2fs-devel@lists.sourceforge.net Date: Sat, 21 May 2022 23:03:00 -0700 Message-Id: <20220522060300.94891-1-jaegeuk@kernel.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog MIME-Version: 1.0 X-Headers-End: 1nsegJ-0002uR-SQ Subject: [f2fs-dev] [PATCH] f2fs-tools: move android_config before defining them X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jaegeuk Kim Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Signed-off-by: Jaegeuk Kim --- fsck/f2fs.h | 4 ++-- fsck/xattr.h | 2 ++ mkfs/f2fs_format.c | 6 ++++-- tools/f2fscrypt.c | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fsck/f2fs.h b/fsck/f2fs.h index 875f953fb6cc..030d75067a8e 100644 --- a/fsck/f2fs.h +++ b/fsck/f2fs.h @@ -20,6 +20,8 @@ #include #include #include +#include + #ifdef HAVE_MNTENT_H #include #endif @@ -35,8 +37,6 @@ #endif #include -#include "f2fs_fs.h" - #define EXIT_ERR_CODE (-1) #define ver_after(a, b) (typecheck(unsigned long long, a) && \ typecheck(unsigned long long, b) && \ diff --git a/fsck/xattr.h b/fsck/xattr.h index 4e4b50d47bd7..74aa5418cbd3 100644 --- a/fsck/xattr.h +++ b/fsck/xattr.h @@ -35,7 +35,9 @@ struct f2fs_xattr_entry { }; #define FS_ENCRYPTION_CONTEXT_FORMAT_V1 1 +#ifndef FS_KEY_DESCRIPTOR_SIZE #define FS_KEY_DESCRIPTOR_SIZE 8 +#endif #define FS_KEY_DERIVATION_NONCE_SIZE 16 struct fscrypt_context { diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c index 2759b5a03bc4..3b96d3182ac8 100644 --- a/mkfs/f2fs_format.c +++ b/mkfs/f2fs_format.c @@ -8,11 +8,15 @@ */ #define _LARGEFILE64_SOURCE +#include "config.h" + #include #include #include #include #include +#include + #ifdef HAVE_SYS_STAT_H #include #endif @@ -21,7 +25,6 @@ #endif #include -#include "config.h" #ifdef HAVE_UUID_UUID_H #include #endif @@ -30,7 +33,6 @@ #define uuid_generate(a) #endif -#include "f2fs_fs.h" #include "quota.h" #include "f2fs_format_utils.h" diff --git a/tools/f2fscrypt.c b/tools/f2fscrypt.c index b406bcf56640..1233f3a5b103 100644 --- a/tools/f2fscrypt.c +++ b/tools/f2fscrypt.c @@ -21,6 +21,8 @@ #endif #include "config.h" +#include + #include #include #include @@ -44,8 +46,6 @@ #include #endif -#include - #ifdef HAVE_UUID_UUID_H #include #else -- 2.36.1.124.g0e6072fb45-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel