Commit 626d114f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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
parents 978d6a90 2d4594ac
...@@ -451,9 +451,9 @@ void v9fs_evict_inode(struct inode *inode) ...@@ -451,9 +451,9 @@ void v9fs_evict_inode(struct inode *inode)
{ {
struct v9fs_inode *v9inode = V9FS_I(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); clear_inode(inode);
filemap_fdatawrite(inode->i_mapping); filemap_fdatawrite(&inode->i_data);
v9fs_cache_inode_put_cookie(inode); v9fs_cache_inode_put_cookie(inode);
/* clunk the fid stashed in writeback_fid */ /* clunk the fid stashed in writeback_fid */
......
...@@ -1175,6 +1175,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, ...@@ -1175,6 +1175,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
if (dio->flags & DIO_LOCKING) if (dio->flags & DIO_LOCKING)
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
kmem_cache_free(dio_cache, dio); kmem_cache_free(dio_cache, dio);
retval = 0;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment