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 17ABCC433EF for ; Wed, 29 Jun 2022 13:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233777AbiF2NHl (ORCPT ); Wed, 29 Jun 2022 09:07:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233757AbiF2NHa (ORCPT ); Wed, 29 Jun 2022 09:07:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C0A638196 for ; Wed, 29 Jun 2022 06:07:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 27484B8247B for ; Wed, 29 Jun 2022 13:07:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 874B1C34114; Wed, 29 Jun 2022 13:07:12 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="UOHUa893" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1656508031; 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=9MIW/ue0haCu8c80MW6du7D3lgpZUfr2vnSqgqiQGV0=; b=UOHUa893m+X8X7/xFk9Fltve6jX0rue5hXj1LpkSng4+S9r+ZYKf3AFL/yUDTu+jLJSRrv F3r8bot8sH5fviEaraSC25b5Vdc9C/sS02uRLxWtZ+JwQ+27gLkTGJmRwIdB0fErmU6cZl hLPu9hQvRTWtfeZeQC0PWmMMQH5Qtvs= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id fea34d8e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Wed, 29 Jun 2022 13:07:11 +0000 (UTC) From: "Jason A. Donenfeld" To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk Cc: "Jason A. Donenfeld" Subject: [PATCH v3 2/7] fs: clear or set FMODE_LSEEK based on llseek function Date: Wed, 29 Jun 2022 15:06:57 +0200 Message-Id: <20220629130702.954310-3-Jason@zx2c4.com> In-Reply-To: <20220629130702.954310-1-Jason@zx2c4.com> References: <20220629130702.954310-1-Jason@zx2c4.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This helps unify a longstanding wart where FMODE_LSEEK hasn't been uniformly unset when it should be. Signed-off-by: Jason A. Donenfeld --- fs/file_table.c | 2 ++ fs/open.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fs/file_table.c b/fs/file_table.c index 5424e3a8df5f..933686f84bf8 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -243,6 +243,8 @@ static struct file *alloc_file(const struct path *path, int flags, file->f_mode |= FMODE_CAN_WRITE; file->f_mode |= FMODE_OPENED; file->f_op = fop; + if (file->f_op->llseek) + file->f_mode |= FMODE_LSEEK; if ((file->f_mode & (FMODE_READ | FMODE_WRITE)) == FMODE_READ) i_readcount_inc(path->dentry->d_inode); return file; diff --git a/fs/open.c b/fs/open.c index 1d57fbde2feb..07c332753a36 100644 --- a/fs/open.c +++ b/fs/open.c @@ -858,6 +858,8 @@ static int do_dentry_open(struct file *f, if ((f->f_mode & FMODE_WRITE) && likely(f->f_op->write || f->f_op->write_iter)) f->f_mode |= FMODE_CAN_WRITE; + if ((f->f_mode & FMODE_LSEEK) && !f->f_op->llseek) + f->f_mode &= ~FMODE_LSEEK; if (f->f_mapping->a_ops && f->f_mapping->a_ops->direct_IO) f->f_mode |= FMODE_CAN_ODIRECT; -- 2.35.1