xfs-linux/xfs_iomap.c - diff

Return to xfs_iomap.c CVS log

Up to [OSS] / xfs-linux

version 1.51, 2007/03/02 02:59:33	version 1.52, 2007/03/30 04:04:14
Line 458 xfs_iomap_write_direct(	Line 458 xfs_iomap_write_direct(
extsz = ip->i_d.di_extsize;	extsz = ip->i_d.di_extsize;
}	}

isize = ip->i_d.di_size;	isize = ip->i_size;
if (io->io_new_size > isize)	if (io->io_new_size > isize)
isize = io->io_new_size;	isize = io->io_new_size;

Line 524 xfs_iomap_write_direct(	Line 524 xfs_iomap_write_direct(
xfs_trans_ihold(tp, ip);	xfs_trans_ihold(tp, ip);

bmapi_flag = XFS_BMAPI_WRITE;	bmapi_flag = XFS_BMAPI_WRITE;
if ((flags & BMAPI_DIRECT) && (offset < ip->i_d.di_size \|\| extsz))	if ((flags & BMAPI_DIRECT) && (offset < ip->i_size \|\| extsz))
bmapi_flag \|= XFS_BMAPI_PREALLOC;	bmapi_flag \|= XFS_BMAPI_PREALLOC;

/*	/*
Line 676 xfs_iomap_write_delay(	Line 676 xfs_iomap_write_delay(
offset_fsb = XFS_B_TO_FSBT(mp, offset);	offset_fsb = XFS_B_TO_FSBT(mp, offset);

retry:	retry:
isize = ip->i_d.di_size;	isize = ip->i_size;
if (io->io_new_size > isize)	if (io->io_new_size > isize)
isize = io->io_new_size;	isize = io->io_new_size;

Line 817 xfs_iomap_write_allocate(	Line 817 xfs_iomap_write_allocate(
* we dropped the ilock in the interim.	* we dropped the ilock in the interim.
*/	*/

end_fsb = XFS_B_TO_FSB(mp, ip->i_d.di_size);	end_fsb = XFS_B_TO_FSB(mp, ip->i_size);
xfs_bmap_last_offset(NULL, ip, &last_block,	xfs_bmap_last_offset(NULL, ip, &last_block,
XFS_DATA_FORK);	XFS_DATA_FORK);
last_block = XFS_FILEOFF_MAX(last_block, end_fsb);	last_block = XFS_FILEOFF_MAX(last_block, end_fsb);