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 X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F359C433DB for ; Mon, 15 Mar 2021 17:15:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E57E64E4D for ; Mon, 15 Mar 2021 17:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231652AbhCOROm (ORCPT ); Mon, 15 Mar 2021 13:14:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:35796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233615AbhCOROL (ORCPT ); Mon, 15 Mar 2021 13:14:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1BA3A64DE4; Mon, 15 Mar 2021 17:14:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615828451; bh=Zn0NuoF4FDwqU755pbTGkJmqJF85FYrm/Q6GdL4fBMM=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=EPa3+rhd80ZnlpYMaP4pX9n8jH+PLz+QOIvn1NMqsduGnTdJbSa/P7hExiVt+bBpG KXQ2jwDbwhkXu2hvaEyAv05jXLIa/JIC9bSANLBOmZHnezsF9mNSU1HMQOh3GbFKEC aPAx13ZG+83VbUIUnNW/O63NUqJb8xfnLzgFbUKaZYOz7dXXc6J+qyp0K5Bvp5pstG L1USJJoMG72jNI0Ms7tAnfAMLdPh+/VDaXhGNHQjEUMDXQ3vpMLcvmvHkqlYm/WxB2 glQ1SeorO0gDYgMPptYN3BPiSqRY0grj2Q4kNDDYB5r62r6N2wEaP0BwLOxNqeeyDU ujKyv6WcVXU/w== Message-ID: Subject: Re: [PATCH v2 14/15] 9p: missing chunk of "fs/9p: Don't update file type when updating file attributes" From: Jeff Layton To: Al Viro , Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, David Howells , Hans de Goede , Mike Marshall , Joseph Qi , Bob Peterson , Steve French , Richard Weinberger , Dominique Martinet , Arnd Bergmann Date: Mon, 15 Mar 2021 13:14:09 -0400 In-Reply-To: <20210313043824.1283821-14-viro@zeniv.linux.org.uk> References: <20210313043824.1283821-1-viro@zeniv.linux.org.uk> <20210313043824.1283821-14-viro@zeniv.linux.org.uk> Content-Type: text/plain; charset="ISO-8859-15" User-Agent: Evolution 3.38.4 (3.38.4-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Sat, 2021-03-13 at 04:38 +0000, Al Viro wrote: > In commit 45089142b149 Aneesh had missed one (admittedly, very unlikely > to hit) case in v9fs_stat2inode_dotl(). However, the same considerations > apply there as well - we have no business whatsoever to change ->i_rdev > or the file type. > > Signed-off-by: Al Viro > --- >  fs/9p/vfs_inode_dotl.c | 10 +++------- >  1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c > index df0b87b05c42..e1c0240b51c0 100644 > --- a/fs/9p/vfs_inode_dotl.c > +++ b/fs/9p/vfs_inode_dotl.c > @@ -663,14 +663,10 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode, >   if (stat->st_result_mask & P9_STATS_NLINK) >   set_nlink(inode, stat->st_nlink); >   if (stat->st_result_mask & P9_STATS_MODE) { > - inode->i_mode = stat->st_mode; > - if ((S_ISBLK(inode->i_mode)) || > - (S_ISCHR(inode->i_mode))) > - init_special_inode(inode, inode->i_mode, > - inode->i_rdev); > + mode = stat->st_mode & S_IALLUGO; > + mode |= inode->i_mode & ~S_IALLUGO; > + inode->i_mode = mode; >   } > - if (stat->st_result_mask & P9_STATS_RDEV) > - inode->i_rdev = new_decode_dev(stat->st_rdev); >   if (!(flags & V9FS_STAT2INODE_KEEP_ISIZE) && >   stat->st_result_mask & P9_STATS_SIZE) >   v9fs_i_size_write(inode, stat->st_size); Reviewed-by: Jeff Layton