Diff for /xfs-linux/linux-2.6/xfs_aops.c between versions 1.156 and 1.157

version 1.156, 2007/09/21 04:08:28 version 1.157, 2007/09/21 16:10:12
Line 163  xfs_destroy_ioend( Line 163  xfs_destroy_ioend(
 /*  /*
  * Update on-disk file size now that data has been written to disk.   * Update on-disk file size now that data has been written to disk.
  * The current in-memory file size is i_size.  If a write is beyond   * The current in-memory file size is i_size.  If a write is beyond
  * eof io_new_size will be the intended file size until i_size is   * eof i_new_size will be the intended file size until i_size is
  * updated.  If this write does not extend all the way to the valid   * updated.  If this write does not extend all the way to the valid
  * file size then restrict this update to the end of the write.   * file size then restrict this update to the end of the write.
  */   */
Line 185  xfs_setfilesize( Line 185  xfs_setfilesize(
   
         xfs_ilock(ip, XFS_ILOCK_EXCL);          xfs_ilock(ip, XFS_ILOCK_EXCL);
   
         isize = MAX(ip->i_size, ip->i_iocore.io_new_size);          isize = MAX(ip->i_size, ip->i_new_size);
         isize = MIN(isize, bsize);          isize = MIN(isize, bsize);
   
         if (ip->i_d.di_size < isize) {          if (ip->i_d.di_size < isize) {

Removed from v.1.156  
changed lines
  Added in v.1.157


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>