From 57193ecabcf8355cca99a919295ffd0bc2dd5a24 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 16 Nov 2011 19:21:30 +0000 Subject: [PATCH] Those patches were mistakenly generated for patch -p0. Fix it. Thanks Bart Van Assche for reporting it. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3926 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- .../patches/put_page_callback-3.1.patch | 64 +++++++++---------- scst/kernel/scst_exec_req_fifo-3.1.patch | 24 +++---- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/iscsi-scst/kernel/patches/put_page_callback-3.1.patch b/iscsi-scst/kernel/patches/put_page_callback-3.1.patch index 53bb6318b..ccc1ebb33 100644 --- a/iscsi-scst/kernel/patches/put_page_callback-3.1.patch +++ b/iscsi-scst/kernel/patches/put_page_callback-3.1.patch @@ -1,6 +1,6 @@ -=== modified file 'include/linux/mm_types.h' ---- include/linux/mm_types.h 2011-10-26 20:34:50 +0000 -+++ include/linux/mm_types.h 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/include/linux/mm_types.h' +--- linux-3.1-orig/include/linux/mm_types.h 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/include/linux/mm_types.h 2011-10-26 20:57:41 +0000 @@ -124,6 +124,17 @@ struct page { */ void *shadow; @@ -20,9 +20,9 @@ /* * If another subsystem starts using the double word pairing for atomic -=== modified file 'include/linux/net.h' ---- include/linux/net.h 2011-10-26 20:34:50 +0000 -+++ include/linux/net.h 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/include/linux/net.h' +--- linux-3.1-orig/include/linux/net.h 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/include/linux/net.h 2011-10-26 20:57:41 +0000 @@ -61,6 +61,7 @@ typedef enum { #include /* For O_CLOEXEC and O_NONBLOCK */ #include @@ -77,9 +77,9 @@ #endif /* __KERNEL__ */ #endif /* _LINUX_NET_H */ -=== modified file 'net/Kconfig' ---- net/Kconfig 2011-10-26 20:34:50 +0000 -+++ net/Kconfig 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/Kconfig' +--- linux-3.1-orig/net/Kconfig 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/Kconfig 2011-10-26 20:57:41 +0000 @@ -72,6 +72,18 @@ config INET Short answer: say Y. @@ -100,9 +100,9 @@ source "net/ipv4/Kconfig" source "net/ipv6/Kconfig" -=== modified file 'net/core/dev.c' ---- net/core/dev.c 2011-10-26 20:34:50 +0000 -+++ net/core/dev.c 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/core/dev.c' +--- linux-3.1-orig/net/core/dev.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/core/dev.c 2011-10-26 20:57:41 +0000 @@ -3432,7 +3432,7 @@ pull: skb_shinfo(skb)->frags[0].size -= grow; @@ -113,9 +113,9 @@ skb_shinfo(skb)->frags + 1, --skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t)); -=== modified file 'net/core/skbuff.c' ---- net/core/skbuff.c 2011-10-26 20:34:50 +0000 -+++ net/core/skbuff.c 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/core/skbuff.c' +--- linux-3.1-orig/net/core/skbuff.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/core/skbuff.c 2011-10-26 20:57:41 +0000 @@ -77,13 +77,13 @@ static struct kmem_cache *skbuff_fclone_ static void sock_pipe_buf_release(struct pipe_inode_info *pipe, struct pipe_buffer *buf) @@ -268,9 +268,9 @@ if (pos < offset) { -=== modified file 'net/ipv4/Makefile' ---- net/ipv4/Makefile 2011-10-26 20:34:50 +0000 -+++ net/ipv4/Makefile 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/ipv4/Makefile' +--- linux-3.1-orig/net/ipv4/Makefile 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/ipv4/Makefile 2011-10-26 20:57:41 +0000 @@ -48,6 +48,7 @@ obj-$(CONFIG_TCP_CONG_LP) += tcp_lp.o obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o @@ -280,9 +280,9 @@ obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \ xfrm4_output.o -=== modified file 'net/ipv4/ip_output.c' ---- net/ipv4/ip_output.c 2011-10-26 20:34:50 +0000 -+++ net/ipv4/ip_output.c 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/ipv4/ip_output.c' +--- linux-3.1-orig/net/ipv4/ip_output.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/ipv4/ip_output.c 2011-10-26 20:57:41 +0000 @@ -994,7 +994,7 @@ alloc_new_skb: err = -EMSGSIZE; goto error; @@ -302,9 +302,9 @@ } else { err = -EMSGSIZE; -=== modified file 'net/ipv4/tcp.c' ---- net/ipv4/tcp.c 2011-10-26 20:34:50 +0000 -+++ net/ipv4/tcp.c 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/ipv4/tcp.c' +--- linux-3.1-orig/net/ipv4/tcp.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/ipv4/tcp.c 2011-10-26 20:57:41 +0000 @@ -815,7 +815,7 @@ new_segment: if (can_coalesce) { skb_shinfo(skb)->frags[i - 1].size += copy; @@ -336,9 +336,9 @@ } } -=== modified file 'net/ipv4/tcp_output.c' ---- net/ipv4/tcp_output.c 2011-10-26 20:34:50 +0000 -+++ net/ipv4/tcp_output.c 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/ipv4/tcp_output.c' +--- linux-3.1-orig/net/ipv4/tcp_output.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/ipv4/tcp_output.c 2011-10-26 20:57:41 +0000 @@ -1095,7 +1095,7 @@ static void __pskb_trim_head(struct sk_b k = 0; for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { @@ -350,8 +350,8 @@ skb_shinfo(skb)->frags[k] = skb_shinfo(skb)->frags[i]; === added file 'net/ipv4/tcp_zero_copy.c' ---- net/ipv4/tcp_zero_copy.c 1970-01-01 00:00:00 +0000 -+++ net/ipv4/tcp_zero_copy.c 2011-10-26 20:57:41 +0000 +--- linux-3.1-orig/net/ipv4/tcp_zero_copy.c 1970-01-01 00:00:00 +0000 ++++ linux-3.1-scst/net/ipv4/tcp_zero_copy.c 2011-10-26 20:57:41 +0000 @@ -0,0 +1,49 @@ +/* + * Support routines for TCP zero copy transmit @@ -403,9 +403,9 @@ +} +EXPORT_SYMBOL_GPL(net_set_get_put_page_callbacks); -=== modified file 'net/ipv6/ip6_output.c' ---- net/ipv6/ip6_output.c 2011-10-26 20:34:50 +0000 -+++ net/ipv6/ip6_output.c 2011-10-26 20:57:41 +0000 +=== modified file 'linux-3.1-scst/net/ipv6/ip6_output.c' +--- linux-3.1-orig/net/ipv6/ip6_output.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/net/ipv6/ip6_output.c 2011-10-26 20:57:41 +0000 @@ -1485,7 +1485,7 @@ alloc_new_skb: err = -EMSGSIZE; goto error; diff --git a/scst/kernel/scst_exec_req_fifo-3.1.patch b/scst/kernel/scst_exec_req_fifo-3.1.patch index 33a9a9d52..d6bb5346b 100644 --- a/scst/kernel/scst_exec_req_fifo-3.1.patch +++ b/scst/kernel/scst_exec_req_fifo-3.1.patch @@ -1,6 +1,6 @@ -=== modified file 'block/blk-map.c' ---- block/blk-map.c 2011-10-26 20:34:50 +0000 -+++ block/blk-map.c 2011-10-26 20:58:56 +0000 +=== modified file 'linux-3.1-scst/block/blk-map.c' +--- linux-3.1-orig/block/blk-map.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/block/blk-map.c 2011-10-26 20:58:56 +0000 @@ -5,6 +5,8 @@ #include #include @@ -351,9 +351,9 @@ * blk_rq_map_kern - map kernel data to a request, for REQ_TYPE_BLOCK_PC usage * @q: request queue where request should be inserted -=== modified file 'include/linux/blkdev.h' ---- include/linux/blkdev.h 2011-10-26 20:34:50 +0000 -+++ include/linux/blkdev.h 2011-10-26 20:58:56 +0000 +=== modified file 'linux-3.1-scst/include/linux/blkdev.h' +--- linux-3.1-orig/include/linux/blkdev.h 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/include/linux/blkdev.h 2011-10-26 20:58:56 +0000 @@ -599,6 +599,8 @@ extern unsigned long blk_max_low_pfn, bl #define BLK_DEFAULT_SG_TIMEOUT (60 * HZ) #define BLK_MIN_SG_TIMEOUT (7 * HZ) @@ -374,9 +374,9 @@ struct request *, int); extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *, -=== modified file 'include/linux/scatterlist.h' ---- include/linux/scatterlist.h 2011-10-26 20:34:50 +0000 -+++ include/linux/scatterlist.h 2011-10-26 20:58:56 +0000 +=== modified file 'linux-3.1-scst/include/linux/scatterlist.h' +--- linux-3.1-orig/include/linux/scatterlist.h 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/include/linux/scatterlist.h 2011-10-26 20:58:56 +0000 @@ -3,6 +3,7 @@ #include @@ -397,9 +397,9 @@ * Maximum number of entries that will be allocated in one piece, if * a list larger than this is required then chaining will be utilized. -=== modified file 'lib/scatterlist.c' ---- lib/scatterlist.c 2011-10-26 20:34:50 +0000 -+++ lib/scatterlist.c 2011-10-26 20:58:56 +0000 +=== modified file 'linux-3.1-scst/lib/scatterlist.c' +--- linux-3.1-orig/lib/scatterlist.c 2011-10-26 20:34:50 +0000 ++++ linux-3.1-scst/lib/scatterlist.c 2011-10-26 20:58:56 +0000 @@ -517,3 +517,132 @@ size_t sg_copy_to_buffer(struct scatterl return sg_copy_buffer(sgl, nents, buf, buflen, 1); }