diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /testing/scst-grsec/scst-kernel-2.6.32.patch | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-to-upstream.tar.bz2 aports-to-upstream.tar.xz | |
Merge remote branch 'upstream/master' into to-upstreamto-upstream
Diffstat (limited to 'testing/scst-grsec/scst-kernel-2.6.32.patch')
| -rw-r--r-- | testing/scst-grsec/scst-kernel-2.6.32.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/testing/scst-grsec/scst-kernel-2.6.32.patch b/testing/scst-grsec/scst-kernel-2.6.32.patch new file mode 100644 index 00000000..80fc8610 --- /dev/null +++ b/testing/scst-grsec/scst-kernel-2.6.32.patch @@ -0,0 +1,17 @@ +--- scst-1.0.1.1/src/dev_handlers/scst_vdisk.c.orig ++++ scst-1.0.1.1/src/dev_handlers/scst_vdisk.c +@@ -2071,9 +2071,13 @@ + inode = file->f_dentry->d_inode; + mapping = file->f_mapping; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) + res = sync_page_range(inode, mapping, loff, len); ++#else ++ res = filemap_write_and_wait_range(file->f_mapping, loff, len); ++#endif + if (unlikely(res != 0)) { +- PRINT_ERROR("sync_page_range() failed (%d)", res); ++ PRINT_ERROR("sync range failed (%d)", res); + if (cmd != NULL) { + scst_set_cmd_error(cmd, + SCST_LOAD_SENSE(scst_sense_write_error)); |