Re: [PATCH v2 14/15] 9p: missing chunk of "fs/9p: Don't update file type when updating file attributes"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <viro@xxxxxxxxxxxxxxxxxx>
> ---
>  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 <jlayton@xxxxxxxxxx>




[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]

  Powered by Linux