From patchwork Wed Jul 26 10:26:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Xu X-Patchwork-Id: 13327817 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 35D87C001DE for ; Wed, 26 Jul 2023 10:27:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233866AbjGZK1D (ORCPT ); Wed, 26 Jul 2023 06:27:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233864AbjGZK0y (ORCPT ); Wed, 26 Jul 2023 06:26:54 -0400 Received: from out-55.mta1.migadu.com (out-55.mta1.migadu.com [IPv6:2001:41d0:203:375::37]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 198792684 for ; Wed, 26 Jul 2023 03:26:41 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1690367199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7e4RDFDm8jz3Kb6NZqecvXg19GC0WTDfvDBloY02gI4=; b=QYlhmmBwxtEiNsNPpGdT6VCwV0vXW9/eKFMcdHDqJiJzkKleyVrWcM+oS9lyM12dW3+GB6 Qx9bj4mCGDTyOvFg9zbPkndM62ZYNqhSN8X9ATCD6MtlHAbtw6zUJ/NimZ1V3t7+vga7PH OfFuDepZCG8K1oI21pkY+Tv3dNRBB1Y= From: Hao Xu To: io-uring@vger.kernel.org, Jens Axboe Cc: Dominique Martinet , Pavel Begunkov , Christian Brauner , Alexander Viro , Stefan Roesch , Clay Harris , Dave Chinner , "Darrick J . Wong" , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org, Wanpeng Li Subject: [PATCH 5/7] add llseek_nowait support for xfs Date: Wed, 26 Jul 2023 18:26:01 +0800 Message-Id: <20230726102603.155522-6-hao.xu@linux.dev> In-Reply-To: <20230726102603.155522-1-hao.xu@linux.dev> References: <20230726102603.155522-1-hao.xu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org From: Hao Xu Add llseek_nowait() operation for xfs, it acts just like llseek(). The thing different is it delivers nowait parameter to iomap layer. Signed-off-by: Hao Xu --- fs/xfs/xfs_file.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 73adc0aee2ff..cba82264221d 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1257,10 +1257,11 @@ xfs_file_readdir( } STATIC loff_t -xfs_file_llseek( +__xfs_file_llseek( struct file *file, loff_t offset, - int whence) + int whence, + bool nowait) { struct inode *inode = file->f_mapping->host; @@ -1282,6 +1283,28 @@ xfs_file_llseek( return vfs_setpos(file, offset, inode->i_sb->s_maxbytes); } +STATIC loff_t +xfs_file_llseek( + struct file *file, + loff_t offset, + int whence) +{ + return __xfs_file_llseek(file, offset, whence, false); +} + +STATIC loff_t +xfs_file_llseek_nowait( + struct file *file, + loff_t offset, + int whence, + bool nowait) +{ + if (file->f_op == &xfs_file_operations) + return __xfs_file_llseek(file, offset, whence, nowait); + else + return generic_file_llseek(file, offset, whence); +} + #ifdef CONFIG_FS_DAX static inline vm_fault_t xfs_dax_fault( @@ -1442,6 +1465,7 @@ xfs_file_mmap( const struct file_operations xfs_file_operations = { .llseek = xfs_file_llseek, + .llseek_nowait = xfs_file_llseek_nowait, .read_iter = xfs_file_read_iter, .write_iter = xfs_file_write_iter, .splice_read = xfs_file_splice_read, @@ -1467,6 +1491,7 @@ const struct file_operations xfs_dir_file_operations = { .read = generic_read_dir, .iterate_shared = xfs_file_readdir, .llseek = generic_file_llseek, + .llseek_nowait = xfs_file_llseek_nowait, .unlocked_ioctl = xfs_file_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = xfs_file_compat_ioctl,