diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2021-01-31 20:37:39 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2021-03-13 04:15:22 +0100 |
| commit | b577d0cd2104fdfcf0ded3707540a12be8ddd8b0 (patch) | |
| tree | f42f2a31e9210e85e5ccd5c909c7faf0d194771a /fs/9p | |
| parent | openpromfs: don't do unlock_new_inode() until the new inode is set up (diff) | |
| download | linux-b577d0cd2104fdfcf0ded3707540a12be8ddd8b0.tar.xz linux-b577d0cd2104fdfcf0ded3707540a12be8ddd8b0.zip | |
9p: missing chunk of "fs/9p: Don't update file type when updating file attributes"
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@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p')
| -rw-r--r-- | fs/9p/vfs_inode_dotl.c | 10 |
1 files 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); |