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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE6F0C4332F for ; Wed, 15 Dec 2021 21:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230331AbhLOV7g (ORCPT ); Wed, 15 Dec 2021 16:59:36 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:57702 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230318AbhLOV7d (ORCPT ); Wed, 15 Dec 2021 16:59:33 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BFLidTq016264 for ; Wed, 15 Dec 2021 13:59:33 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=quLcGe8M8WkNv4h+9Ale0u3mw4BzXj5UDLOKMkH4Z9I=; b=JaKvz7QQWJLaGtFafuNW30PYHkUGfy5IJl7W2NlXFrcX6+GJglOgvYIJljkyLLK7KoSe xezzUWyfUpb3jvPi7BMJ8BlmYFWf2qqS+OfJmAaHgwE6S0Ns7Ppe42GQRfh1vorWmL1t wHaF8oKJr008rt+gxEC882TgP0q6wz3L3LI= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3cyf7fvsh0-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 15 Dec 2021 13:59:33 -0800 Received: from intmgw002.25.frc3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 15 Dec 2021 13:59:32 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id D9EDB81A403F; Wed, 15 Dec 2021 13:59:26 -0800 (PST) From: Stefan Roesch To: , CC: , , Christian Brauner Subject: [PATCH v6 2/3] fs: split off vfs_getdents function of getdents64 syscall Date: Wed, 15 Dec 2021 13:59:23 -0800 Message-ID: <20211215215924.3301586-3-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211215215924.3301586-1-shr@fb.com> References: <20211215215924.3301586-1-shr@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-FB-Source: Intern X-Proofpoint-GUID: ZRk9wteGoC67EZc_bIZB2iiMaxAJOWP9 X-Proofpoint-ORIG-GUID: ZRk9wteGoC67EZc_bIZB2iiMaxAJOWP9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2021-12-15_13,2021-12-14_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 bulkscore=0 spamscore=0 mlxlogscore=831 priorityscore=1501 suspectscore=0 mlxscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112150120 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org This splits off the vfs_getdents function from the getdents64 system call. This allows io_uring to call the function. Signed-off-by: Stefan Roesch Acked-by: Christian Brauner --- fs/internal.h | 8 ++++++++ fs/readdir.c | 37 +++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 7979ff8d168c..355be993b9f1 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -194,3 +194,11 @@ long splice_file_to_pipe(struct file *in, struct pipe_inode_info *opipe, loff_t *offset, size_t len, unsigned int flags); + +/* + * fs/readdir.c + */ +struct linux_dirent64; + +int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent= , + unsigned int count, s64 pos); diff --git a/fs/readdir.c b/fs/readdir.c index e9c197edf73a..5c3af16a6178 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -21,6 +21,7 @@ #include #include #include +#include "internal.h" =20 #include =20 @@ -368,22 +369,26 @@ static int filldir64(struct dir_context *ctx, const= char *name, int namlen, return -EFAULT; } =20 -SYSCALL_DEFINE3(getdents64, unsigned int, fd, - struct linux_dirent64 __user *, dirent, unsigned int, count) +/** + * vfs_getdents - getdents without fdget + * @file : pointer to file struct of directory + * @dirent : pointer to user directory structure + * @count : size of buffer + * @ctx_pos : if file pos is used, pass -1, + * if ctx pos is used, pass ctx pos + */ +int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent= , + unsigned int count, s64 ctx_pos) { - struct fd f; struct getdents_callback64 buf =3D { .ctx.actor =3D filldir64, + .ctx.pos =3D ctx_pos, .count =3D count, .current_dir =3D dirent }; int error; =20 - f =3D fdget_pos(fd); - if (!f.file) - return -EBADF; - - error =3D iterate_dir(f.file, &buf.ctx); + error =3D do_iterate_dir(file, &buf.ctx, ctx_pos < 0); if (error >=3D 0) error =3D buf.error; if (buf.prev_reclen) { @@ -396,6 +401,22 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, else error =3D count - buf.count; } + + return error; +} + +SYSCALL_DEFINE3(getdents64, unsigned int, fd, + struct linux_dirent64 __user *, dirent, unsigned int, count) +{ + struct fd f; + int error; + + f =3D fdget_pos(fd); + if (!f.file) + return -EBADF; + + error =3D vfs_getdents(f.file, dirent, count, -1); + fdput_pos(f); return error; } --=20 2.30.2