[PATCH] x86: more asm cleanups

[linux-2.6] / fs / xfs / linux-2.6 / xfs_aops.c

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 9278e9aba9ba7c3bf5946c7efdd3abfedf166798..a3a4b5aaf5d985020672a47e0c6858a21b190ad4 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -149,11 +149,12 @@ linvfs_unwritten_convert(
  */
 STATIC void
 linvfs_unwritten_convert_direct(
-       struct inode    *inode,
+       struct kiocb    *iocb,
        loff_t          offset,
        ssize_t         size,
        void            *private)
 {
+       struct inode    *inode = iocb->ki_filp->f_dentry->d_inode;
        ASSERT(!private || inode == (struct inode *)private);
 
        /* private indicates an unwritten extent lay beneath this IO */
@@ -886,7 +887,6 @@ xfs_page_state_convert(
                SetPageUptodate(page);
 
        if (startio) {
-               WARN_ON(page_dirty);
                xfs_submit_page(page, wbc, bh_arr, cnt, 0, !page_dirty);
        }