Commit 31847192 authored by Natanael Copa's avatar Natanael Copa

main/iscsitarget-grsec: upgrade to 1.4.19 + patch for 2.6.32

parent 815d016c
......@@ -11,7 +11,7 @@ _kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
_kpkgrel=$pkgrel
_iscsiver=1.4.18
_iscsiver=1.4.19
pkgname=${_realname}-${_flavor}
pkgver=$_kver
......@@ -25,14 +25,15 @@ install=
makedepends="linux-${_flavor}-dev=${_kernelver}"
subpackages=
source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz
iscsitarget-1.4.18+linux-2.6.32.patch
"
prepare() {
cd "$srcdir"/$_realname-$_iscsiver
# for i in ../*.patch; do
# msg "Applying $i"
# patch -p1 < $i || return 1
# done
for i in ../*.patch; do
msg "Applying $i"
patch -p1 < $i || return 1
done
}
build() {
......@@ -47,4 +48,5 @@ package() {
make KSRC="$ksrc" DISTDIR="$pkgdir" install-kernel || return 1
}
md5sums="9e756e89cc47aaa71824ed34a6560543 iscsitarget-1.4.18.tar.gz"
md5sums="9beca214c28949cce1716b49fec57de4 iscsitarget-1.4.19.tar.gz
07f6fb7a35172b3be4c4b0101983fe86 iscsitarget-1.4.18+linux-2.6.32.patch"
From 43227c1624e919efcd0cd035516c1776be55ac08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Sun, 18 Oct 2009 12:41:28 +0200
Subject: [PATCH] Fix building with Linux kernel 2.6.32 and later.
With commit 18f2ee705d98034b0f229a3202d827468d4bffd9 of the Linux kernel,
the sync_page_range() function has been removed.
This patch changes it to filemap_write_and_wait_range() as done for the XFS
driver in the kernel (commit af0f4414f343429971d33b0dd8dccc85c1f3dcd2).
---
kernel/file-io.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/file-io.c b/kernel/file-io.c
index dbf7b1c..e4c3fea 100644
--- a/kernel/file-io.c
+++ b/kernel/file-io.c
@@ -8,6 +8,7 @@
#include <linux/blkdev.h>
#include <linux/parser.h>
#include <linux/writeback.h>
+#include <linux/version.h>
#include "iscsi.h"
#include "iscsi_dbg.h"
@@ -88,7 +89,12 @@ static int fileio_sync(struct iet_volume *lu, struct tio *tio)
count = lu->blk_cnt << lu->blk_shift;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
res = sync_page_range(inode, mapping, ppos, count);
+#else
+ res = filemap_write_and_wait_range(mapping, ppos,
+ ppos + count -1);
+#endif
if (res) {
eprintk("I/O error: syncing pages failed: %d\n", res);
return -EIO;
--
1.6.5
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment