[PATCH] Use the incore inode size in xfs_file_readdir()

Lachlan McIlroy
2008-12-04T06:58:48Z

We should be using the incore inode size here not the linux inode
size. The incore inode size is always up to date for directories
whereas the linux inode size is not updated for directories.

We've hit assertions in xfs_bmap() and traced it back to the linux
inode size being zero here but the incore size being correct.

--- xfs-fix.orig/fs/xfs/linux-2.6/xfs_file.c
+++ xfs-fix/fs/xfs/linux-2.6/xfs_file.c
@@ -254,7 +254,7 @@ xfs_file_readdir(
* point we can change the ->readdir prototype to include the
* buffer size.
*/
- bufsize = (size_t)min_t(loff_t, PAGE_SIZE, inode->i_size);
+ bufsize = (size_t)min_t(loff_t, PAGE_SIZE, ip->i_d.di_size);

error = xfs_readdir(ip, dirent, bufsize,
(xfs_off_t *)&filp->f_pos, filldir);