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:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH 3/4] f2fs: move the conditional statement to hold the inode lock in f2fs_release_compress_blocks()
Date:   Tue,  9 May 2023 17:57:05 +0800
Message-Id: <20230509095706.17844-3-frank.li@vivo.com>
In-Reply-To: <20230509095706.17844-1-frank.li@vivo.com>
References: <20230509095706.17844-1-frank.li@vivo.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?f1rGVgq6gkOdQ0zi8zvvUZf7uXzt6gYkMi0SDej75U0tIugx0upy0jHfakeQ?=
 =?us-ascii?Q?dXG8Begza5miyxCepDb++OiVr0g4/7J+q2gR5Obpymzcpv+qwUu41hmKZ9jI?=
 =?us-ascii?Q?hF8CVn5D8jVaVgpJe0DQNMWRTgQZQGHxW+sJA7MHQM5JIlbhTOzmGsx1w/G5?=
 =?us-ascii?Q?JzF0pBOJq7x1utjKxbVKeQdG9uAMHZkZVjLLCKFZax54SKDKTVtxhmf/akFg?=
 =?us-ascii?Q?H82wexPzFB+yzrgQ2u/o9lO5wwrnAtn8WmbayDGOPBw5QjVJbty8PYCFrTa0?=
 =?us-ascii?Q?csmlVUFGbOw3MSG6jIjQRE4NaZxGShxNPXUepERVF4I/bpHiG6WZLEF9rwRw?=
 =?us-ascii?Q?SJwizhctv3cHjK9iAC52W5CtOpJumGu7CNkYT4dGwI1Rf94gHvKelg9lHzFd?=
 =?us-ascii?Q?/+w4Ipx51eO02hIqFEiaKSSlecVhSW7BIam8jzJhaWmhc2SK68TikqlFM4to?=
 =?us-ascii?Q?E/+zioQHW6x7gFzNiPm0YxQq4lyQSdM9/HspXrk1Utb22Hz6H3rhq8cR6BTL?=
 =?us-ascii?Q?Ij2aNRY7ReLIXzlq9X6C9Tw3DJ6bR1zZtATo/N1Gsr30zaGKqjq3ANDU2MqS?=
 =?us-ascii?Q?CnBjcitEWzyhjd0+Np8DfVE5fLvJlwshTQX48+IKK6TD2aWxwA+UjuPOczdW?=
 =?us-ascii?Q?mu5Zx2pCrbNsFZQyi3eZyagVtTgYf/VCuvhFAoSZZr4fZDvm7SUgQgNRutJx?=
 =?us-ascii?Q?aUTJ3I0NtN6cGmN4ZwohNpNiD8CoJsOsRHNOWStVG5yK3gW+qRMrjPU63Au4?=
 =?us-ascii?Q?pHQJim6SPejpP5DyNI81rzq6H7om4v1F6a/LB57wGtXaoBsqZ0/RK729JQGh?=
 =?us-ascii?Q?eHyyeMYZbwsbOl8Du6nMp1pgjvmeF11RO/998uXiKUtJBpfez8YJRCjRz0iM?=
 =?us-ascii?Q?UAMN/op4rPQkbDWRGU3873nBq+2QZWO8zROUr1Zroh9nbCAMiD4n/P5mB4+N?=
 =?us-ascii?Q?bkW3IbynJl40UDC3z2aPxuZImhwdqdD+ou8ASu6vAH9I237YQmEJk1QWvrau?=
 =?us-ascii?Q?Rdjf5cOxqkwIMZccU0IVjStAJBHBsypGDjSrsdfmkf7wnoXJmr3qirqHv2Zm?=
 =?us-ascii?Q?d1FAFIoKh11iCICBCnWOoXodU5x+gL2gByfFopyHsN9NAn4pfPGjff47i8mp?=
 =?us-ascii?Q?seJaudGWGNTH9DdlVOd4q5EvNdYOLyiXUxLhsJzpgZ71cdzEqP6/SbXpBoYe?=
 =?us-ascii?Q?bqLvJy5QIb+ZvvELkCgjglCWzufHpGZjusWAJls7AFj5EHlVt5zFX1qaakaI?=
 =?us-ascii?Q?4qKnS1mGhb+aTEwL5/mi+2aTNlYOZ5+PM2TOZMMerPTsHysoKlAOmSODlHD9?=
 =?us-ascii?Q?i84CcvlZIOKUT8oxCSJAdFQBGbl3LQ5BXZ+hR6wwEKtt9Y2CNJPMRgfL4XfM?=
 =?us-ascii?Q?HbE19GNHoFwkFoti91/B/IvAN+9mhp0aq75pureb/WZuDCyJlVr2UwO0qkuh?=
 =?us-ascii?Q?Ki13ptCPAea2PESEfa5y+V/m/TnNhQgqd9ZMISMX2fF9w324NPjOmjHrx2HG?=
 =?us-ascii?Q?JQloQsiW7XfyV+Fndc9cSdtQ7SgbLQxLPvejdPpi4jlSRl1Oln9gmoFVOMhl?=
 =?us-ascii?Q?7RjA/J+1rFe9uKMnAiD9pUDPakMUlTCub4zIGPCJ?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 14fc43ed-cf77-44ac-fac8-08db5073c8a6
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2023 09:57:22.2818
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oun4Z8NKXNFUomNrHGbkA4vzV4piuMHbKTNq/mMvDiFN/jqPMCNONR3ZjOJQFo5kw36FsnL1EVftAgXT6lpOeA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB6130
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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

For judging the inode flag state, the inode lock must be held.

Fixes: ef8d563f184e ("f2fs: introduce F2FS_IOC_RELEASE_COMPRESS_BLOCKS")
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/file.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index a6180d4d94cb..32dc9a250a36 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -3469,9 +3469,6 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
 	if (!f2fs_sb_has_compression(sbi))
 		return -EOPNOTSUPP;
 
-	if (!f2fs_compressed_file(inode))
-		return -EINVAL;
-
 	if (f2fs_readonly(sbi->sb))
 		return -EROFS;
 
@@ -3483,6 +3480,11 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg)
 
 	inode_lock(inode);
 
+	if (!f2fs_compressed_file(inode)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
 	writecount = atomic_read(&inode->i_writecount);
 	if ((filp->f_mode & FMODE_WRITE && writecount != 1) ||
 			(!(filp->f_mode & FMODE_WRITE) && writecount)) {
-- 
2.39.0