From patchwork Wed Dec 22 21:07:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roesch X-Patchwork-Id: 12697298 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 63AE2C433F5 for ; Wed, 22 Dec 2021 21:07:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231349AbhLVVHO (ORCPT ); Wed, 22 Dec 2021 16:07:14 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:64844 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbhLVVHN (ORCPT ); Wed, 22 Dec 2021 16:07:13 -0500 Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1BMIrA2N022609 for ; Wed, 22 Dec 2021 13:07:13 -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=maKUEsrXreQEdv70dvYM6PyPTmWdehj8lma5Y9RMvj4=; b=Eq/T0vVVgI8J/Z1hvgdCAVFMWMhVp2ozhpIgQfN2iMbRVDpnpHuUqhnXLCQpBbAcfF2T zoKNctCriVGlLnrZHOW1ifLI1wEVV1sSlRObQvIc0mb2uZt7RUI2riR6BAp5y+ssL+wr 30yqaiR0J6g+9dII3cBDbyG+XQItN92XKK8= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3d49pdgshh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 22 Dec 2021 13:07:13 -0800 Received: from twshared18912.14.frc2.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 22 Dec 2021 13:07:12 -0800 Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415) id A152F86F0391; Wed, 22 Dec 2021 13:07:10 -0800 (PST) From: Stefan Roesch To: CC: , Christian Brauner Subject: [PATCH v7 2/3] fs: split off vfs_getdents function of getdents64 syscall Date: Wed, 22 Dec 2021 13:07:07 -0800 Message-ID: <20211222210708.983429-3-shr@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211222210708.983429-1-shr@fb.com> References: <20211222210708.983429-1-shr@fb.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: IaW11h2oi0ehgwYcPW8xHiqQz34hNxjY X-Proofpoint-ORIG-GUID: IaW11h2oi0ehgwYcPW8xHiqQz34hNxjY 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-22_09,2021-12-22_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 mlxscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=833 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112220111 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org This splits off the vfs_getdents function from the getdents64 system call. This allows io_uring to call the vfs_getdents function. Signed-off-by: Stefan Roesch Acked-by: Christian Brauner --- fs/internal.h | 8 ++++++++ fs/readdir.c | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/fs/internal.h b/fs/internal.h index 7979ff8d168c..432ea3ce76ec 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, loff_t *pos); diff --git a/fs/readdir.c b/fs/readdir.c index c1e6612e0f47..1b1fade87525 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -21,6 +21,7 @@ #include #include #include +#include "internal.h" #include @@ -359,22 +360,25 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen, return -EFAULT; } -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 + * @pos : file pos + */ +int vfs_getdents(struct file *file, struct linux_dirent64 __user *dirent, + unsigned int count, loff_t *pos) { - struct fd f; struct getdents_callback64 buf = { .ctx.actor = filldir64, + .ctx.pos = *pos, .count = count, .current_dir = dirent }; int error; - f = fdget_pos(fd); - if (!f.file) - return -EBADF; - - error = iterate_dir(f.file, &buf.ctx, &f.file->f_pos); + error = iterate_dir(file, &buf.ctx, pos); if (error >= 0) error = buf.error; if (buf.prev_reclen) { @@ -391,6 +395,22 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd, return error; } +SYSCALL_DEFINE3(getdents64, unsigned int, fd, + struct linux_dirent64 __user *, dirent, unsigned int, count) +{ + struct fd f; + int error; + + f = fdget_pos(fd); + if (!f.file) + return -EBADF; + + error = vfs_getdents(f.file, dirent, count, &f.file->f_pos); + + fdput_pos(f); + return error; + } + #ifdef CONFIG_COMPAT struct compat_old_linux_dirent { compat_ulong_t d_ino;