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

commit b577d0cd2104fdfcf0ded3707540a12be8ddd8b0 upstream.

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.

Cc: Tadeusz Struk <tadeusz.struk@linaro.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index a13ef836fe4e1b13b7162b0ce6fc5c630e048c70..84f3a6405b5583e62c6ebb83e8a1f590aaf3a2e3 100644 (file)
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -657,14 +657,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);