Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_iomap.c

diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 4bdd796e7ae9cafabb798f373cfb50472992dfce..45a77a3a6c07ed60b2a4fe041c6496c5ded3e1a5 100644 (file)
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -364,7 +364,6 @@ xfs_iomap_write_direct(
        xfs_fileoff_t   offset_fsb;
        xfs_fileoff_t   last_fsb;
        xfs_filblks_t   count_fsb;
-       xfs_fsize_t     isize;
        xfs_fsblock_t   firstfsb;
        int             nimaps;
        int             error;
@@ -374,7 +373,6 @@ xfs_iomap_write_direct(
        xfs_trans_t     *tp;
        xfs_bmbt_irec_t imap;
        xfs_bmap_free_t free_list;
-       int             aeof;
        xfs_filblks_t   qblocks, resblks;
        int             committed;
        int             resrtextents;
@@ -387,12 +385,6 @@ xfs_iomap_write_direct(
        if (error)
                return XFS_ERROR(error);
 
-       isize = ip->i_d.di_size;
-       aeof = (offset + count) > isize;
-
-       if (io->io_new_size > isize)
-               isize = io->io_new_size;
-
        offset_fsb = XFS_B_TO_FSBT(mp, offset);
        last_fsb = XFS_B_TO_FSB(mp, ((xfs_ufsize_t)(offset + count)));
        count_fsb = last_fsb - offset_fsb;