From: Chris Wright Date: Sat, 22 Jul 2006 18:32:14 +0000 (-0700) Subject: move generic_file_buffered patches to queue X-Git-Tag: v2.6.17.7~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e7267ffc8eaf6812851dff3938aeed3b57389b8;p=thirdparty%2Fkernel%2Fstable-queue.git move generic_file_buffered patches to queue --- diff --git a/pending-2.6.17/generic_file_buffered_write-deadlock-on-vectored-write.patch b/queue-2.6.17/generic_file_buffered_write-deadlock-on-vectored-write.patch similarity index 97% rename from pending-2.6.17/generic_file_buffered_write-deadlock-on-vectored-write.patch rename to queue-2.6.17/generic_file_buffered_write-deadlock-on-vectored-write.patch index 1c2fa0ceba0..b95f45c6817 100644 --- a/pending-2.6.17/generic_file_buffered_write-deadlock-on-vectored-write.patch +++ b/queue-2.6.17/generic_file_buffered_write-deadlock-on-vectored-write.patch @@ -30,8 +30,8 @@ Signed-off-by: Chris Wright mm/filemap.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---- linux-2.6.17.1.orig/mm/filemap.c -+++ linux-2.6.17.1/mm/filemap.c +--- linux-2.6.17.6.orig/mm/filemap.c ++++ linux-2.6.17.6/mm/filemap.c @@ -2004,14 +2004,21 @@ generic_file_buffered_write(struct kiocb do { unsigned long index; diff --git a/pending-2.6.17/generic_file_buffered_write-handle-zero-length-iovec-segments.patch b/queue-2.6.17/generic_file_buffered_write-handle-zero-length-iovec-segments.patch similarity index 83% rename from pending-2.6.17/generic_file_buffered_write-handle-zero-length-iovec-segments.patch rename to queue-2.6.17/generic_file_buffered_write-handle-zero-length-iovec-segments.patch index f010f722a31..ff7f1306b7e 100644 --- a/pending-2.6.17/generic_file_buffered_write-handle-zero-length-iovec-segments.patch +++ b/queue-2.6.17/generic_file_buffered_write-handle-zero-length-iovec-segments.patch @@ -37,11 +37,9 @@ Signed-off-by: Chris Wright mm/filemap.h | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) -diff --git a/mm/filemap.c b/mm/filemap.c -index 4082b3b..648f2c0 100644 ---- a/mm/filemap.c -+++ b/mm/filemap.c -@@ -2125,6 +2125,12 @@ generic_file_buffered_write(struct kiocb +--- linux-2.6.17.6.orig/mm/filemap.c ++++ linux-2.6.17.6/mm/filemap.c +@@ -2034,6 +2034,12 @@ generic_file_buffered_write(struct kiocb break; } @@ -54,7 +52,7 @@ index 4082b3b..648f2c0 100644 status = a_ops->prepare_write(file, page, offset, offset+bytes); if (unlikely(status)) { loff_t isize = i_size_read(inode); -@@ -2154,7 +2160,8 @@ generic_file_buffered_write(struct kiocb +@@ -2063,7 +2069,8 @@ generic_file_buffered_write(struct kiocb page_cache_release(page); continue; } @@ -64,11 +62,9 @@ index 4082b3b..648f2c0 100644 if (!status) status = copied; -diff --git a/mm/filemap.h b/mm/filemap.h -index 536979f..3f2a343 100644 ---- a/mm/filemap.h -+++ b/mm/filemap.h -@@ -88,7 +88,7 @@ filemap_set_next_iovec(const struct iove +--- linux-2.6.17.6.orig/mm/filemap.h ++++ linux-2.6.17.6/mm/filemap.h +@@ -78,7 +78,7 @@ filemap_set_next_iovec(const struct iove const struct iovec *iov = *iovp; size_t base = *basep; @@ -77,7 +73,7 @@ index 536979f..3f2a343 100644 int copy = min(bytes, iov->iov_len - base); bytes -= copy; -@@ -97,7 +97,7 @@ filemap_set_next_iovec(const struct iove +@@ -87,7 +87,7 @@ filemap_set_next_iovec(const struct iove iov++; base = 0; } @@ -86,4 +82,3 @@ index 536979f..3f2a343 100644 *iovp = iov; *basep = base; } - diff --git a/queue-2.6.17/series b/queue-2.6.17/series index 301213eb694..e9263127739 100644 --- a/queue-2.6.17/series +++ b/queue-2.6.17/series @@ -25,3 +25,5 @@ fix-powernow-k8-smp-kernel-on-up-hardware-bug.patch cdrom-fix-bad-cgc.buflen-assignment.patch splice-fix-problems-with-sys_tee.patch USB-serial-ftdi_sio-Prevent-userspace-DoS.patch +generic_file_buffered_write-deadlock-on-vectored-write.patch +generic_file_buffered_write-handle-zero-length-iovec-segments.patch