Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f91da317 authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

9p: missing chunk of "fs/9p: Don't update file type when updating file attributes" 



commit b577d0cd2104fdfcf0ded3707540a12be8ddd8b0 upstream.

In commit 45089142 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.

Cc: Tadeusz Struk <tadeusz.struk@linaro.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a31bd366

fs/9p/vfs_inode_dotl.c

+3 −7
Original line number Diff line number Diff line
@@ -641,14 +641,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);

		}

		if (stat->st_result_mask & P9_STATS_RDEV)

			inode->i_rdev = new_decode_dev(stat->st_rdev);

			mode = stat->st_mode & S_IALLUGO;

			mode |= inode->i_mode & ~S_IALLUGO;

			inode->i_mode = mode;

		}

		if (!(flags & V9FS_STAT2INODE_KEEP_ISIZE) &&

		    stat->st_result_mask & P9_STATS_SIZE)

			v9fs_i_size_write(inode, stat->st_size);