Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4365424pxb; Tue, 2 Mar 2021 13:16:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzpnyqhz+s/9MIbql9qTmuG2fmjB9Zs156SOfTeY7UQeUe/Q0KjMr0Ji16+ljTM1QD7axZ9 X-Received: by 2002:a05:6402:382:: with SMTP id o2mr8192171edv.238.1614719775558; Tue, 02 Mar 2021 13:16:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614719775; cv=none; d=google.com; s=arc-20160816; b=vrUR8iJIe3gx5M02uLqJagEKFRyEFTk9FQefd/2gOsXcAhKU6iCmHxMeVY4hSfzOeK ApDK8KLUlMpJyyy+PK/Thbl/V9y3cXwIciFJyGE+2T0gw/LrJqf+LstyX5Kba3z0Rhuf SSV2FTVqVL6xAL/GZwyi8hdkQJpf8I6wFRqr7ngep7+P9Lf9FJvI0gAtT9Z9ELzURtTq NNE1KEajTVOIpbRadx21wM0znArqlKhLbe5x/igCvuTpwTFMtxG8QX1GbkWNXPEHq6YC Q0XIQNDkbu6jRA6Jm9TBl3uwXk8L7uXes1elSdbJtCwZxC6O5HRWBxPzTLFbdlZTZ0aY 01ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=jzMv3mfYCo8BKFuj23ApMkTHr7SWDpWYNUuPsMbN2UM=; b=qnDQixEu35jHMWIrKu76kuUNfyihUuep6JZx3XHpAM5vbZXLb4eW/w2tM+ElFuojsC 41K3/pBIy2qIdmBbK+OqZHQehaWPuSLtJfYVBueCOnWLz4V6zRjSX+0VzRnQ/8vTgbw0 uBWdV61faORZrDk+TNa3Jx8vY+NoQkTQcRLyZ0L3DnV5dSv5Tu758upB7+Oas6nf5w+L bPrbiCQrE6Ls7FPSQkvAaXUSF48cxa5P0lcGdw3ZOt5oNpE3yptkj+aaGNF1R5iVg8ar bZwfvv9dqF8mbaqYxwtvmRQNikJ1JCVVE9t1X/ZI8lf6xMt2FaF5tiiV+SjXzKqsinVb Se4Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c6si3404577edr.602.2021.03.02.13.15.50; Tue, 02 Mar 2021 13:16:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382280AbhCBJIk (ORCPT + 99 others); Tue, 2 Mar 2021 04:08:40 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:13832 "EHLO szxga07-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378635AbhCBIyd (ORCPT ); Tue, 2 Mar 2021 03:54:33 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4DqVls14Skz7s37; Tue, 2 Mar 2021 16:34:01 +0800 (CST) Received: from szvp000203569.huawei.com (10.120.216.130) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.498.0; Tue, 2 Mar 2021 16:35:35 +0800 From: Chao Yu To: CC: , , , Chao Yu Subject: [PATCH] f2fs: remove unused file_clear_encrypt() Date: Tue, 2 Mar 2021 16:35:32 +0800 Message-ID: <20210302083532.11669-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - file_clear_encrypt() was never be used, remove it. - In addition, relocating macros for cleanup. Signed-off-by: Chao Yu --- fs/f2fs/f2fs.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4fc343aa0a08..ddd54f5cf932 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -637,21 +637,26 @@ enum { #define FADVISE_MODIFIABLE_BITS (FADVISE_COLD_BIT | FADVISE_HOT_BIT) #define file_is_cold(inode) is_file(inode, FADVISE_COLD_BIT) -#define file_wrong_pino(inode) is_file(inode, FADVISE_LOST_PINO_BIT) #define file_set_cold(inode) set_file(inode, FADVISE_COLD_BIT) -#define file_lost_pino(inode) set_file(inode, FADVISE_LOST_PINO_BIT) #define file_clear_cold(inode) clear_file(inode, FADVISE_COLD_BIT) + +#define file_wrong_pino(inode) is_file(inode, FADVISE_LOST_PINO_BIT) +#define file_lost_pino(inode) set_file(inode, FADVISE_LOST_PINO_BIT) #define file_got_pino(inode) clear_file(inode, FADVISE_LOST_PINO_BIT) + #define file_is_encrypt(inode) is_file(inode, FADVISE_ENCRYPT_BIT) #define file_set_encrypt(inode) set_file(inode, FADVISE_ENCRYPT_BIT) -#define file_clear_encrypt(inode) clear_file(inode, FADVISE_ENCRYPT_BIT) + #define file_enc_name(inode) is_file(inode, FADVISE_ENC_NAME_BIT) #define file_set_enc_name(inode) set_file(inode, FADVISE_ENC_NAME_BIT) + #define file_keep_isize(inode) is_file(inode, FADVISE_KEEP_SIZE_BIT) #define file_set_keep_isize(inode) set_file(inode, FADVISE_KEEP_SIZE_BIT) + #define file_is_hot(inode) is_file(inode, FADVISE_HOT_BIT) #define file_set_hot(inode) set_file(inode, FADVISE_HOT_BIT) #define file_clear_hot(inode) clear_file(inode, FADVISE_HOT_BIT) + #define file_is_verity(inode) is_file(inode, FADVISE_VERITY_BIT) #define file_set_verity(inode) set_file(inode, FADVISE_VERITY_BIT) -- 2.29.2