Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (626d114f) · Commits · 戴 / test

Pull vfs fixes from Al Viro: "A couple of fixes, both -stable fodder (9p one all way back to 2.6.32, dio - to all branches where "Fix negative return from dio read beyond eof" will end up it; it's a fixup to commit marked for -stable)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix the regression from "direct-io: Fix negative return from dio read beyond eof" 9p: ->evict_inode() should kick out ->i_data, not ->i_mapping

fs/9p/vfs_inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -451,9 +451,9 @@ void v9fs_evict_inode(struct inode *inode)
		{
		struct v9fs_inode *v9inode = V9FS_I(inode);

		truncate_inode_pages_final(inode->i_mapping);
		truncate_inode_pages_final(&inode->i_data);
		clear_inode(inode);
		filemap_fdatawrite(inode->i_mapping);
		filemap_fdatawrite(&inode->i_data);

		v9fs_cache_inode_put_cookie(inode);
		/* clunk the fid stashed in writeback_fid */

fs/direct-io.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1175,6 +1175,7 @@ do_blockdev_direct_IO(struct kiocb iocb, struct inode inode,
		if (dio->flags & DIO_LOCKING)
		mutex_unlock(&inode->i_mutex);
		kmem_cache_free(dio_cache, dio);
		retval = 0;
		goto out;
		}

Admin message