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;
Date:   Fri, 5 May 2023 14:12:39 +0800 (CST)
Message-ID: <202305051412396252364@zte.com.cn>
Mime-Version: 1.0
From:   <ye.xingchen@zte.com.cn>
To:     <jgg@ziepe.ca>
Cc:     <kevin.tian@intel.com>, <joro@8bytes.org>, <will@kernel.org>,
        <robin.murphy@arm.com>, <iommu@lists.linux.dev>,
        <linux-kernel@vger.kernel.org>
Subject: =?UTF-8?B?W1BBVENIXSBpb21tdWZkL3NlbGZ0ZXN0OiBVc2UgZmRnZXQoKSBhbmQgZmRwdXQoKQ==?=
Content-Type: text/plain;
        charset="UTF-8"
Precedence: bulk

From: Ye Xingchen <ye.xingchen@zte.com.cn>

convert the fget()/fput() uses to fdget()/fdput().

Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
---
 drivers/iommu/iommufd/selftest.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 74c2076105d4..d3512fa673a5 100644
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -583,17 +583,16 @@ static const struct file_operations iommfd_test_staccess_fops;

 static struct selftest_access *iommufd_access_get(int fd)
 {
-	struct file *file;
+	struct fd f = fdget(fd);

-	file = fget(fd);
-	if (!file)
+	if (!f.file)
 		return ERR_PTR(-EBADFD);

-	if (file->f_op != &iommfd_test_staccess_fops) {
-		fput(file);
+	if (f.file->f_op != &iommfd_test_staccess_fops) {
+		fdput(f);
 		return ERR_PTR(-EBADFD);
 	}
-	return file->private_data;
+	return f.file->private_data;
 }

 static void iommufd_test_access_unmap(void *data, unsigned long iova,
-- 
2.25.1