diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2010-05-26 23:09:04 +0000 |
| commit | 9fddb4d5b41c0b5e69d5ee138297e95eff290302 (patch) | |
| tree | b353402b4af0ac5b912dc78ca7d996c397b8e2e3 /testing/scst-grsec/scst-kernel-2.6.32.patch | |
| parent | ccf26410d30adc8c1934dd553687157ed6e31d69 (diff) | |
| parent | 8c1128e93e03012dabadb9a3f723dbd20eb60cd4 (diff) | |
| download | aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.bz2 aports-9fddb4d5b41c0b5e69d5ee138297e95eff290302.tar.xz | |
Merged from Alpine main repository.
Merge
Conflicts:
main/abuild/APKBUILD
main/cramfs/APKBUILD
main/curl/APKBUILD
main/dialog/APKBUILD
main/libconfig/APKBUILD
main/snort/APKBUILD
main/syslinux/APKBUILD
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 000000000..80fc8610a --- /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)); |