Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sheng Yong <shengyong@oppo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Sheng Yong <shengyong@oppo.com>
Subject: [PATCH 2/2] f2fs_io: convert compression ioctls to [get|set]_attr
Date:   Mon, 29 May 2023 09:35:02 +0800
Message-Id: <20230529013502.2230810-3-shengyong@oppo.com>
In-Reply-To: <20230529013502.2230810-1-shengyong@oppo.com>
References: <20230529013502.2230810-1-shengyong@oppo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BlBoxuf7fRH1zRGY5JhVYiJTKt16abvC4KQGjPui2pfDSA3H/S3ujlzgIkMZ?=
 =?us-ascii?Q?0eSP9tF9Ww2GOzncs56ID6BsE9ryYrzPpmLIFvDUmLV1+44uYTPdaYYFh27k?=
 =?us-ascii?Q?6z9QdDlqjatwZaSQcw+U+qQAulhr1TdRqxybuQ6B2h8mHEp9l7+YgIK+gs23?=
 =?us-ascii?Q?92AvipfGVhhktPWV6XGSIrhj8BB4B5elwqiXjvbjsl0sEywVxh2k0lXRZr52?=
 =?us-ascii?Q?cqbFf6Gogn+hTT4yGrN1exYlYWz2xJi5irzwm4tzqcR7r09VeQpQhvyik6QG?=
 =?us-ascii?Q?SKOH3VJIgGLr9kv7DehcX5IiaNhTiSXE1NgE+YlKq8mI20nVa/iXkd/6qzfG?=
 =?us-ascii?Q?OYiQ1DvxvK5fdfFA9M84Nm9HJgATyCWlsvAmD7MagPznMxef/YeMywxnfc8/?=
 =?us-ascii?Q?MHkwEIfprQ36+Txg5BL52nSWcealdPtNdmJBFmyontLaxDikebO3ai1Y+flD?=
 =?us-ascii?Q?8zp9cqucxalNiZskyPo2EJdGvQUUlLpLgz3FlrJ7OQrwqOhg0PHyATlA/7ZC?=
 =?us-ascii?Q?9ddNh2+1TV0T+b7bXnLPJlu3hVYAEZDAeiWcOge9y/tp9/W4aZAJX0oFOUrh?=
 =?us-ascii?Q?Nv9YqJVIrdxogXceGWIR0HWqKzOy6fkYF79LO6AxfLyqoGV88Sj0w3a6vT1W?=
 =?us-ascii?Q?ZVy7o2APbWtd/gEkwAV5H39BMHSCDTvXk62PIxUMnpp7rjbsby7Bvh27MKK+?=
 =?us-ascii?Q?SwrlU6cHOBfua4GzeHifb6eIJ4uCMFMh+9+OUhWEyt7enN9vwiaUksvvjeNT?=
 =?us-ascii?Q?XaK0t7gt8zk+GXT/jbsdOvOcsKkNfPcsDUY4D1KMhttR3ZAH/WSGO+sBdXxG?=
 =?us-ascii?Q?EvfVFhGLY2ohgO27EO55lPtxawpSe3wH2V0TRr3ccDY/V7hnNkHpE4v6FGzC?=
 =?us-ascii?Q?D5KoqFZhEUq5AMAbG3cmKHGZYtY+YJ/PeoCkvUy4qBg2zScRN42vRjrcadu4?=
 =?us-ascii?Q?eQzc4L3z1KBt5r4JP3tbJejtyG/ZzxbWa/SHok49k8xsyyVJax1RzypKsHF6?=
 =?us-ascii?Q?Ce47n7itJwAuhKXVqbcqsRtrHUocbb3FtIc6p0r3QxSRpZwBTcXhWBPC4IfA?=
 =?us-ascii?Q?H6Rm3S7VFHmy0Lqit1Pi35nsYYyw41HU3tR1j51X+SpUdliBkuBM8To3wP0k?=
 =?us-ascii?Q?Y304SBiyjlMiE5tPPNUlhC7gwvu/aLfeO93xSYRdo6JLMNX28rm4dajcCSG4?=
 =?us-ascii?Q?a4K+1OXBFE/f7/leH/VI8CaNUgZB1Tri+2D4AGXg/19qMMmetNXHiHEkAcBF?=
 =?us-ascii?Q?G+TZcPd9zUD3EIQa8F973A7u1PO8t7/a3RbPDd6+wmAobt9L8/QD+NTXUU2D?=
 =?us-ascii?Q?b2APDGxqvnMTR8hVYXyhx7eymS5iGbcyU+loSlNnwuuFzncxH6+Pjb0yXgoA?=
 =?us-ascii?Q?XIlT3WhgxPqWLmZ88EojWuhAwVIh8hS3mTFFcofOH+zmEVRuQ1Od4aGt1/wd?=
 =?us-ascii?Q?AHkwqpnFFEDYWHTLgWtF9MHgIbBvgVjCeZuUd1LR3UVfJXOlCv+mnj3uK8Fp?=
 =?us-ascii?Q?GkG6LZ8EAohMR+laGfBTsqZ1PZhYh8ovEdxuVJ1/vnBSzzNH6lVb908tGD3T?=
 =?us-ascii?Q?/TEfs3zClDehYuAmnWRgFyiklMCCpjGbLNVcW9Ll?=
X-OriginatorOrg: oppo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4de4f23c-04f2-4474-2add-08db5fe50358
X-MS-Exchange-CrossTenant-AuthSource: SI2PR02MB5148.apcprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 01:35:41.3453
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f1905eb1-c353-41c5-9516-62b4a54b5ee6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Y+YZ45ehPDNgxKDps3uL5+pDHeqgvKmuemS/zKVCPxK36Q3N1c0SacxGnPaggg7G+NgjBDL9jFDWYjiyYnl+Ow==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR02MB4617
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert compression related ioctls to get extra attr ioctls.

Signed-off-by: Sheng Yong <shengyong@oppo.com>
---
 tools/f2fs_io/f2fs_io.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tools/f2fs_io/f2fs_io.c b/tools/f2fs_io/f2fs_io.c
index 70e0347..f6e6057 100644
--- a/tools/f2fs_io/f2fs_io.c
+++ b/tools/f2fs_io/f2fs_io.c
@@ -1012,7 +1012,9 @@ static void do_copy(int argc, char **argv, const struct cmd_desc *cmd)
 
 static void do_get_cblocks(int argc, char **argv, const struct cmd_desc *cmd)
 {
-	unsigned long long blkcnt;
+	struct f2fs_extra_attr attr = {
+		.field = F2FS_EXTRA_ATTR_COMPR_BLOCKS,
+	};
 	int ret, fd;
 
 	if (argc != 2) {
@@ -1023,11 +1025,11 @@ static void do_get_cblocks(int argc, char **argv, const struct cmd_desc *cmd)
 
 	fd = xopen(argv[1], O_RDONLY, 0);
 
-	ret = ioctl(fd, F2FS_IOC_GET_COMPRESS_BLOCKS, &blkcnt);
+	ret = ioctl(fd, F2FS_IOC_GET_EXTRA_ATTR, &attr);
 	if (ret < 0)
 		die_errno("F2FS_IOC_GET_COMPRESS_BLOCKS failed");
 
-	printf("%llu\n", blkcnt);
+	printf("%llu\n", (unsigned long long)attr.attr);
 
 	exit(0);
 }
@@ -1090,6 +1092,7 @@ static void do_reserve_cblocks(int argc, char **argv, const struct cmd_desc *cmd
 
 static void do_get_coption(int argc, char **argv, const struct cmd_desc *cmd)
 {
+	struct f2fs_extra_attr attr = {0};
 	struct f2fs_comp_option option;
 	int ret, fd;
 
@@ -1099,11 +1102,15 @@ static void do_get_coption(int argc, char **argv, const struct cmd_desc *cmd)
 		exit(1);
 	}
 
+	attr.field = F2FS_EXTRA_ATTR_COMPR_OPTION;
+	attr.attr_size = sizeof(option);
+	attr.attr = (unsigned long)&option;
+
 	fd = xopen(argv[1], O_RDONLY, 0);
 
-	ret = ioctl(fd, F2FS_IOC_GET_COMPRESS_OPTION, &option);
+	ret = ioctl(fd, F2FS_IOC_GET_EXTRA_ATTR, &attr);
 	if (ret < 0)
-		die_errno("F2FS_IOC_GET_COMPRESS_OPTION failed");
+		die_errno("F2FS_IOC_GET_EXTRA_ATTR failed");
 
 	printf("compression algorithm:%u\n", option.algorithm);
 	printf("compression cluster log size:%u\n", option.log_cluster_size);
@@ -1119,6 +1126,7 @@ static void do_get_coption(int argc, char **argv, const struct cmd_desc *cmd)
 
 static void do_set_coption(int argc, char **argv, const struct cmd_desc *cmd)
 {
+	struct f2fs_extra_attr attr = {0};
 	struct f2fs_comp_option option;
 	int fd, ret;
 
@@ -1130,12 +1138,15 @@ static void do_set_coption(int argc, char **argv, const struct cmd_desc *cmd)
 
 	option.algorithm = atoi(argv[1]);
 	option.log_cluster_size = atoi(argv[2]);
+	attr.field = F2FS_EXTRA_ATTR_COMPR_OPTION;
+	attr.attr_size = sizeof(option);
+	attr.attr = (unsigned long)&option;
 
 	fd = xopen(argv[3], O_WRONLY, 0);
 
-	ret = ioctl(fd, F2FS_IOC_SET_COMPRESS_OPTION, &option);
+	ret = ioctl(fd, F2FS_IOC_SET_EXTRA_ATTR, &attr);
 	if (ret < 0)
-		die_errno("F2FS_IOC_SET_COMPRESS_OPTION failed");
+		die_errno("F2FS_IOC_SET_EXTRA_ATTR failed");
 
 	printf("set compression option: algorithm=%u, log_cluster_size=%u\n",
 			option.algorithm, option.log_cluster_size);
-- 
2.40.1