← Back to branch summary

~smb/ubuntu/oneiric/iscsitarget/proposed

« back to all changes in this revision

Viewing changes to patches/compat-2.6.31.patch

  • Committer: Colin Watson
  • Date: 2010-08-16 20:59:52 UTC
  • mfrom: (2.1.9 sid)
  • Revision ID: cjwatson@canonical.com-20100816205952-hyytf817ju6wk1bj
merge from Debian 1.4.20.2-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/compat-2.6.31.patch
 
1
--- sync/kernel/file-io.c       2009-12-10 17:43:36.000000000 -0500
 
2
+++ trunk/kernel/file-io.c      2008-12-04 17:35:21.000000000 -0500
 
3
@@ -89,7 +89,7 @@
 
4
                count = lu->blk_cnt << lu->blk_shift;
 
5
        }
 
6
 
 
7
-       res = filemap_write_and_wait_range(mapping, ppos, ppos + count - 1);
 
8
+       res = sync_page_range(inode, mapping, ppos, count);
 
9
        if (res) {
 
10
                eprintk("I/O error: syncing pages failed: %d\n", res);
 
11
                return -EIO;