Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/afs/write.c b/fs/afs/write.c
index 28f37516c126..a03b92a0fe1d 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -206,7 +206,6 @@ int afs_prepare_write(struct file *file, struct page *page,
                         _leave(" = %d [prep]", ret);
                         return ret;
                 }
-                SetPageUptodate(page);
         }
 
 try_again:
@@ -311,8 +310,8 @@ int afs_commit_write(struct file *file, struct page *page,
                 spin_unlock(&vnode->writeback_lock);
         }
 
+        SetPageUptodate(page);
         set_page_dirty(page);
-
         if (PageDirty(page))
                 _debug("dirtied");