- Fixed typos noticed by Tomasz Chmielewski

- Forgotten fixes for previous commit
--Tohis line, and those below, will be ignored--

M    trunk/iscsi-scst/kernel/patches/put_page_callback-2.6.16.29.patch
M    trunk/iscsi-scst/kernel/patches/put_page_callback-2.6.21.1.patch
M    trunk/iscsi-scst/kernel/patches/put_page_callback-2.6.22.patch
M    trunk/iscsi-scst/kernel/patches/put_page_callback-2.6.23.patch
M    trunk/iscsi-scst/kernel/patches/put_page_callback-2.6.18.1.patch
M    trunk/scst-full_perf.patch
M    trunk/scst-release.patch


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@211 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2007-10-25 10:46:29 +00:00
parent 3e3ff59ca8
commit 4685895276
7 changed files with 22 additions and 17 deletions

View File

@@ -7,7 +7,7 @@ diff -upr linux-2.6.16.29/include/linux/mm.h linux-2.6.16.29/include/linux/mm.h
#endif /* WANT_PAGE_VIRTUAL */
+ /*
+ * Used to implement support for notification on zero-copy TCP transfer
+ * completeion. Not good to have this field here, it's better to have
+ * completion. Not good to have this field here, it's better to have
+ * it in struct sk_buff, but it would make the code much more
+ * complicated and fragile, if maintained as a separate patch, since all
+ * skb then would have to contain only pages with the same value in this
@@ -32,7 +32,7 @@ diff -upr linux-2.6.16.29/include/linux/net.h linux-2.6.16.29/include/linux/net.
extern int net_msg_burst;
#endif
+/* Support for notification on zero-copy TCP transfer completeion */
+/* Support for notification on zero-copy TCP transfer completion */
+#define NET_PAGE_CALLBACKS_DEFINED
+typedef void (*net_get_page_callback_t)(struct page *page);
+typedef void (*net_put_page_callback_t)(struct page *page);

View File

@@ -7,7 +7,7 @@ diff -upr linux-2.6.18.1/include/linux/mm.h linux-2.6.18.1/include/linux/mm.h
#endif /* WANT_PAGE_VIRTUAL */
+ /*
+ * Used to implement support for notification on zero-copy TCP transfer
+ * completeion. Not good to have this field here, it's better to have
+ * completion. Not good to have this field here, it's better to have
+ * it in struct sk_buff, but it would make the code much more
+ * complicated and fragile, if maintained as a separate patch, since all
+ * skb then would have to contain only pages with the same value in this
@@ -32,7 +32,7 @@ diff -upr linux-2.6.18.1/include/linux/net.h linux-2.6.18.1/include/linux/net.h
extern int net_msg_burst;
#endif
+/* Support for notification on zero-copy TCP transfer completeion */
+/* Support for notification on zero-copy TCP transfer completion */
+#define NET_PAGE_CALLBACKS_DEFINED
+typedef void (*net_get_page_callback_t)(struct page *page);
+typedef void (*net_put_page_callback_t)(struct page *page);

View File

@@ -7,7 +7,7 @@ diff -upr linux-2.6.21.1/include/linux/mm_types.h linux-2.6.21.1/include/linux/m
#endif /* WANT_PAGE_VIRTUAL */
+ /*
+ * Used to implement support for notification on zero-copy TCP transfer
+ * completeion. Not good to have this field here, it's better to have
+ * completion. Not good to have this field here, it's better to have
+ * it in struct sk_buff, but it would make the code much more
+ * complicated and fragile, if maintained as a separate patch, since all
+ * skb then would have to contain only pages with the same value in this
@@ -32,7 +32,7 @@ diff -upr linux-2.6.21.1/include/linux/net.h linux-2.6.21.1/include/linux/net.h
extern int net_msg_burst;
#endif
+/* Support for notification on zero-copy TCP transfer completeion */
+/* Support for notification on zero-copy TCP transfer completion */
+#define NET_PAGE_CALLBACKS_DEFINED
+typedef void (*net_get_page_callback_t)(struct page *page);
+typedef void (*net_put_page_callback_t)(struct page *page);

View File

@@ -7,7 +7,7 @@ diff -upr linux-2.6.22/include/linux/mm_types.h linux-2.6.22/include/linux/mm_ty
#endif /* WANT_PAGE_VIRTUAL */
+ /*
+ * Used to implement support for notification on zero-copy TCP transfer
+ * completeion. Not good to have this field here, it's better to have
+ * completion. Not good to have this field here, it's better to have
+ * it in struct sk_buff, but it would make the code much more
+ * complicated and fragile, if maintained as a separate patch, since all
+ * skb then would have to contain only pages with the same value in this
@@ -32,7 +32,7 @@ diff -upr linux-2.6.22/include/linux/net.h linux-2.6.22/include/linux/net.h
extern int net_msg_burst;
#endif
+/* Support for notification on zero-copy TCP transfer completeion */
+/* Support for notification on zero-copy TCP transfer completion */
+#define NET_PAGE_CALLBACKS_DEFINED
+typedef void (*net_get_page_callback_t)(struct page *page);
+typedef void (*net_put_page_callback_t)(struct page *page);

View File

@@ -7,7 +7,7 @@ diff -upkr linux-2.6.23/include/linux/mm_types.h linux-2.6.23/include/linux/mm_t
#endif /* WANT_PAGE_VIRTUAL */
+ /*
+ * Used to implement support for notification on zero-copy TCP transfer
+ * completeion. Not good to have this field here, it's better to have
+ * completion. Not good to have this field here, it's better to have
+ * it in struct sk_buff, but it would make the code much more
+ * complicated and fragile, if maintained as a separate patch, since all
+ * skb then would have to contain only pages with the same value in this
@@ -32,7 +32,7 @@ diff -upkr linux-2.6.23/include/linux/net.h linux-2.6.23/include/linux/net.h
extern int net_msg_burst;
#endif
+/* Support for notification on zero-copy TCP transfer completeion */
+/* Support for notification on zero-copy TCP transfer completion */
+#define NET_PAGE_CALLBACKS_DEFINED
+typedef void (*net_get_page_callback_t)(struct page *page);
+typedef void (*net_put_page_callback_t)(struct page *page);

View File

@@ -1,15 +1,17 @@
Index: scst/src/Makefile
===================================================================
--- scst/src/Makefile (revision 324)
--- scst/src/Makefile (revision 210)
+++ scst/src/Makefile (working copy)
@@ -114,13 +114,13 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
@@ -114,7 +114,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
#EXTRA_CFLAGS += -DSTRICT_SERIALIZING
-EXTRA_CFLAGS += -DEXTRACHECKS
+#EXTRA_CFLAGS += -DEXTRACHECKS
#EXTRA_CFLAGS += -fno-inline
#EXTRA_CFLAGS += -DUSE_EXPECTED_VALUES
#EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ
@@ -123,7 +123,7 @@ EXTRA_CFLAGS += -DEXTRACHECKS
#EXTRA_CFLAGS += -DTRACING
@@ -20,7 +22,7 @@ Index: scst/src/Makefile
#EXTRA_CFLAGS += -DDEBUG_OOM
Index: scst/src/dev_handlers/Makefile
===================================================================
--- scst/src/dev_handlers/Makefile (revision 324)
--- scst/src/dev_handlers/Makefile (revision 208)
+++ scst/src/dev_handlers/Makefile (working copy)
@@ -68,10 +68,10 @@ endif

View File

@@ -1,14 +1,17 @@
Index: scst/src/Makefile
===================================================================
--- scst/src/Makefile (revision 324)
--- scst/src/Makefile (revision 210)
+++ scst/src/Makefile (working copy)
@@ -114,13 +114,13 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
@@ -114,16 +114,16 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr
#EXTRA_CFLAGS += -DSTRICT_SERIALIZING
-EXTRA_CFLAGS += -DEXTRACHECKS
+#EXTRA_CFLAGS += -DEXTRACHECKS
#EXTRA_CFLAGS += -DUSE_EXPECTED_VALUES
#EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ
#EXTRA_CFLAGS += -fno-inline
-#EXTRA_CFLAGS += -DTRACING
@@ -21,7 +24,7 @@ Index: scst/src/Makefile
#EXTRA_CFLAGS += -DDEBUG_OOM
Index: scst/src/dev_handlers/Makefile
===================================================================
--- scst/src/dev_handlers/Makefile (revision 324)
--- scst/src/dev_handlers/Makefile (revision 208)
+++ scst/src/dev_handlers/Makefile (working copy)
@@ -68,10 +68,10 @@ endif