[pve-devel] r6157 - pve-kernel-2.6.32-rh/trunk

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Jun 24 12:39:11 CEST 2011


Author: dietmar
Date: 2011-06-24 12:39:11 +0200 (Fri, 24 Jun 2011)
New Revision: 6157

Removed:
   pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-compile-fix.diff
   pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-crypto-api.diff
   pve-kernel-2.6.32-rh/trunk/drbd-8.3.4.tar.gz
   pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff
   pve-kernel-2.6.32-rh/trunk/use-init-task-credential.patch
Modified:
   pve-kernel-2.6.32-rh/trunk/Makefile
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-06-24 10:35:51 UTC (rev 6156)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-06-24 10:39:11 UTC (rev 6157)
@@ -93,8 +93,6 @@
 	install -m 644 ${KERNEL_SRC}/System.map tmp/boot/System.map-${KVNAME}
 	install -m 644 ${KERNEL_SRC}/arch/x86_64/boot/bzImage tmp/boot/vmlinuz-${KVNAME}
 	cd ${KERNEL_SRC}; make INSTALL_MOD_PATH=../tmp/ modules_install
-	# install drbd module
-	#install -m 644 -D drbd.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/drbd/drbd.ko
 	# install latest aoe driver
 	install -m 644 aoe.ko tmp/lib/modules/${KVNAME}/kernel/drivers/block/aoe/aoe.ko
 	# install latest ixgbe driver

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-06-24 10:35:51 UTC (rev 6156)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-06-24 10:39:11 UTC (rev 6157)
@@ -9,7 +9,7 @@
   * include ovz-fix-slow-fsync.patch
   
   * removed SCST support
-  
+    
  -- Proxmox Support Team <support at proxmox.com>  Fri, 24 Jun 2011 08:01:39 +0200
 
 pve-kernel-2.6.32 (2.6.32-35) unstable; urgency=low

Deleted: pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-compile-fix.diff
===================================================================
--- pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-compile-fix.diff	2011-06-24 10:35:51 UTC (rev 6156)
+++ pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-compile-fix.diff	2011-06-24 10:39:11 UTC (rev 6157)
@@ -1,22 +0,0 @@
---- drbd-8.3.4/drbd/drbd_req.c.org	2009-12-16 11:11:19.000000000 +0100
-+++ drbd-8.3.4/drbd/drbd_req.c	2009-12-16 11:12:45.000000000 +0100
-@@ -60,8 +60,8 @@
- 	cpu = part_stat_lock();
- 	part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
- 	part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
-+	part_inc_in_flight(&mdev->vdisk->part0, rw);
- 	part_stat_unlock();
--	mdev->vdisk->part0.in_flight++;
- #endif
- }
- 
-@@ -82,8 +82,8 @@
- 	cpu = part_stat_lock();
- 	part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
- 	part_round_stats(cpu, &mdev->vdisk->part0);
-+	part_dec_in_flight(&mdev->vdisk->part0, rw); 
- 	part_stat_unlock();
--	mdev->vdisk->part0.in_flight--;
- #endif
- }
- 

Deleted: pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-crypto-api.diff
===================================================================
--- pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-crypto-api.diff	2011-06-24 10:35:51 UTC (rev 6156)
+++ pve-kernel-2.6.32-rh/trunk/drbd-8.3.4-crypto-api.diff	2011-06-24 10:39:11 UTC (rev 6157)
@@ -1,12 +0,0 @@
---- drbd-8.3.4/drbd/drbd_nl.c.org	2009-12-22 11:35:24.000000000 +0100
-+++ drbd-8.3.4/drbd/drbd_nl.c	2009-12-22 11:36:16.000000000 +0100
-@@ -1282,8 +1282,7 @@
- 			goto fail;
- 		}
- 
--		if (crypto_tfm_alg_type(crypto_hash_tfm(tfm))
--						!= CRYPTO_ALG_TYPE_HASH) {
-+		if (!drbd_crypto_is_hash(crypto_hash_tfm(tfm))) {
- 			retcode = ERR_AUTH_ALG_ND;
- 			goto fail;
- 		}

Deleted: pve-kernel-2.6.32-rh/trunk/drbd-8.3.4.tar.gz
===================================================================
(Binary files differ)

Deleted: pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff
===================================================================
--- pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff	2011-06-24 10:35:51 UTC (rev 6156)
+++ pve-kernel-2.6.32-rh/trunk/put_page_callback-2.6.32.patch.diff	2011-06-24 10:39:11 UTC (rev 6157)
@@ -1,115 +0,0 @@
---- put_page_callback-2.6.32.patch.orig	2011-06-24 10:12:23.000000000 +0200
-+++ put_page_callback-2.6.32.patch	2011-06-24 10:34:19.000000000 +0200
-@@ -1,28 +1,28 @@
--diff -upkr linux-2.6.32.1/include/linux/mm_types.h linux-2.6.32.1/include/linux/mm_types.h
----- linux-2.6.32.1/include/linux/mm_types.h	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/include/linux/mm_types.h	2009-12-16 15:22:16.000000000 +0300
--@@ -106,6 +106,18 @@ struct page {
-+diff -upr old/include/linux/mm_types.h linux-2.6-2.6.32/include/linux/mm_types.h
-+--- old/include/linux/mm_types.h	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/include/linux/mm_types.h	2011-06-24 10:22:14.000000000 +0200
-+@@ -107,6 +107,18 @@ struct page {
-  	 */
-  	void *shadow;
-  #endif
- +
- +#if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
--+	/*
--+	 * Used to implement support for notification on zero-copy TCP transfer
--+	 * completion. It might look as not good to have this field here and
--+	 * it's better to have it in struct sk_buff, but it would make the code
--+	 * much more complicated and fragile, since all skb then would have to
--+	 * contain only pages with the same value in this field.
--+	 */
--+	 void *net_priv;
-++ 	/*
-++ 	 * Used to implement support for notification on zero-copy TCP transfer
-++ 	 * completion. It might look as not good to have this field here and
-++ 	 * it's better to have it in struct sk_buff, but it would make the code
-++ 	 * much more complicated and fragile, since all skb then would have to
-++ 	 * contain only pages with the same value in this field.
-++ 	 */
-++ 	 void *net_priv;
- +#endif
--+
-- };
-- 
-- /*
--diff -upkr linux-2.6.32.1/include/linux/net.h linux-2.6.32.1/include/linux/net.h
----- linux-2.6.32.1/include/linux/net.h	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/include/linux/net.h	2009-12-16 15:23:08.000000000 +0300
-++ 
-+ 	union {
-+ #ifdef CONFIG_MEMORY_GANGS
-+ 		struct gang *gang;
-+diff -upr old/include/linux/net.h linux-2.6-2.6.32/include/linux/net.h
-+--- old/include/linux/net.h	2011-05-10 20:37:57.000000000 +0200
-++++ linux-2.6-2.6.32/include/linux/net.h	2011-06-24 10:12:56.000000000 +0200
- @@ -20,6 +20,7 @@
-  
-  #include <linux/socket.h>
-@@ -224,19 +224,19 @@
-  			size = frag->size;
-  
-  			if (pos < offset) {
--diff -upkr linux-2.6.32.1/net/ipv4/ip_output.c linux-2.6.32.1/net/ipv4/ip_output.c
----- linux-2.6.32.1/net/ipv4/ip_output.c	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/ipv4/ip_output.c	2009-12-16 15:22:16.000000000 +0300
--@@ -1020,7 +1020,7 @@ alloc_new_skb:
-+diff -upr old/net/ipv4/ip_output.c linux-2.6-2.6.32/net/ipv4/ip_output.c
-+--- old/net/ipv4/ip_output.c	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/net/ipv4/ip_output.c	2011-06-24 10:25:32.000000000 +0200
-+@@ -982,7 +982,7 @@ alloc_new_skb:
-  						err = -EMSGSIZE;
-  						goto error;
-  					}
- -					get_page(page);
- +					net_get_page(page);
-- 					skb_fill_page_desc(skb, i, page, sk->sk_sndmsg_off, 0);
-+ 					skb_fill_page_desc(skb, i, page, off, 0);
-  					frag = &skb_shinfo(skb)->frags[i];
-  				}
--@@ -1178,7 +1178,7 @@ ssize_t	ip_append_page(struct sock *sk, 
-+@@ -1214,7 +1214,7 @@ ssize_t	ip_append_page(struct sock *sk, 
-  		if (skb_can_coalesce(skb, i, page, offset)) {
-  			skb_shinfo(skb)->frags[i-1].size += len;
-  		} else if (i < MAX_SKB_FRAGS) {
-@@ -268,16 +268,16 @@
-  			skb_fill_page_desc(skb, i, page, offset, copy);
-  		}
-  
--@@ -1007,7 +1007,7 @@ new_segment:
-+@@ -1047,7 +1047,7 @@ new_segment:
-  					goto new_segment;
-  				} else if (page) {
-  					if (off == PAGE_SIZE) {
- -						put_page(page);
- +						net_put_page(page);
-+ 						ub_sock_tcp_detachpage(sk);
-  						TCP_PAGE(sk) = page = NULL;
-  						off = 0;
-- 					}
--@@ -1048,9 +1048,9 @@ new_segment:
-+@@ -1092,9 +1092,9 @@ new_segment:
-  				} else {
-  					skb_fill_page_desc(skb, i, page, off, copy);
-  					if (TCP_PAGE(sk)) {
-@@ -287,12 +287,12 @@
- -						get_page(page);
- +						net_get_page(page);
-  						TCP_PAGE(sk) = page;
-- 					}
-- 				}
--diff -upkr linux-2.6.32.1/net/ipv4/tcp_output.c linux-2.6.32.1/net/ipv4/tcp_output.c
----- linux-2.6.32.1/net/ipv4/tcp_output.c	2009-12-03 06:51:21.000000000 +0300
--+++ linux-2.6.32.1/net/ipv4/tcp_output.c	2009-12-16 15:22:16.000000000 +0300
--@@ -909,7 +909,7 @@ static void __pskb_trim_head(struct sk_b
-+ 					} else
-+ 						ub_sock_tcp_detachpage(sk);
-+diff -upr old/net/ipv4/tcp_output.c linux-2.6-2.6.32/net/ipv4/tcp_output.c
-+--- old/net/ipv4/tcp_output.c	2011-06-24 10:12:25.000000000 +0200
-++++ linux-2.6-2.6.32/net/ipv4/tcp_output.c	2011-06-24 10:12:56.000000000 +0200
-+@@ -935,7 +935,7 @@ static void __pskb_trim_head(struct sk_b
-  	k = 0;
-  	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-  		if (skb_shinfo(skb)->frags[i].size <= eat) {

Deleted: pve-kernel-2.6.32-rh/trunk/use-init-task-credential.patch
===================================================================
--- pve-kernel-2.6.32-rh/trunk/use-init-task-credential.patch	2011-06-24 10:35:51 UTC (rev 6156)
+++ pve-kernel-2.6.32-rh/trunk/use-init-task-credential.patch	2011-06-24 10:39:11 UTC (rev 6157)
@@ -1,113 +0,0 @@
-C/R: Use init_task credentials for file restoring procedure
-
-We need highest credentials for file restoring procedure otherwise
-we might hit the situation where credentials for restoring thread
-is not high enough (happens with programs changing their uids).
-
-[ bug: http://bugzilla.openvz.org/show_bug.cgi?id=1603 ]
-
-Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
----
- kernel/cpt/rst_files.c |   42 +++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 37 insertions(+), 5 deletions(-)
-
-Index: linux-2.6-openvz/kernel/cpt/rst_files.c
-=====================================================================
---- linux-2.6-openvz.orig/kernel/cpt/rst_files.c
-+++ linux-2.6-openvz/kernel/cpt/rst_files.c
-@@ -616,12 +616,11 @@ out:
- 	return err;
- }
- 
--static int fixup_file_flags(struct file *file, struct cpt_file_image *fi,
-+static int fixup_file_flags(struct file *file, const struct cred *cred,
-+			    struct cpt_file_image *fi,
- 			    int was_dentry_open, loff_t pos,
- 			    cpt_context_t *ctx)
- {
--	const struct cred *cred = current_cred() /* should be valid already */;
--
- 	if (fi->cpt_pos != file->f_pos) {
- 		int err = -ESPIPE;
- 		if (file->f_op->llseek)
-@@ -824,6 +823,34 @@ static struct file *open_signalfd(struct
- }
- #endif
- 
-+/*
-+ * It may happen that a process which created a file
-+ * had changed its UID after that (keeping file opened/referenced
-+ * with write permissions for 'own' only) as a result we might
-+ * be unable to read it at restore time due to credentials
-+ * mismatch, to break this tie we temporary take 'init_task' credentials
-+ * and as only the file gets read into the memory we restore original
-+ * credentials back
-+ *
-+ * Same time if between credentials rise/restore you need
-+ * the former credentials (for fixups or whatever) --
-+ * use rst_cred_origin for that
-+ */
-+static const struct cred *rst_cred_origin;
-+
-+void rst_creds_rise_current(void)
-+{
-+	struct task_struct *tsk = &init_task;
-+	BUG_ON(rst_cred_origin);
-+	rst_cred_origin = override_creds(tsk->cred);
-+}
-+
-+void rst_creds_restore_current(void)
-+{
-+	revert_creds(rst_cred_origin);
-+	rst_cred_origin = NULL;
-+}
-+
- struct file *rst_file(loff_t pos, int fd, struct cpt_context *ctx)
- {
- 	int err;
-@@ -836,6 +863,8 @@ struct file *rst_file(loff_t pos, int fd
- 	struct proc_dir_entry *proc_dead_file;
- 	int flags;
- 
-+	rst_creds_rise_current();
-+
- 	obj = lookup_cpt_obj_bypos(CPT_OBJ_FILE, pos, ctx);
- 	if (obj) {
- 		file = obj->o_obj;
-@@ -844,9 +873,10 @@ struct file *rst_file(loff_t pos, int fd
- 			err = rst_get_object(CPT_OBJ_FILE, pos, &fi, ctx);
- 			if (err < 0)
- 				goto err_out;
--			fixup_file_flags(file, &fi, 0, pos, ctx);
-+			fixup_file_flags(file, rst_cred_origin, &fi, 0, pos, ctx);
- 		}
- 		get_file(file);
-+		rst_creds_restore_current();
- 		return file;
- 	}
- 
-@@ -1006,7 +1036,7 @@ open_file:
- 	}
- map_file:
- 	if (!IS_ERR(file)) {
--		fixup_file_flags(file, &fi, was_dentry_open, pos, ctx);
-+		fixup_file_flags(file, rst_cred_origin, &fi, was_dentry_open, pos, ctx);
- 
- 		if (S_ISFIFO(fi.cpt_i_mode) && !was_dentry_open) {
- 			err = fixup_pipe_data(file, &fi, ctx);
-@@ -1059,6 +1089,7 @@ map_file:
- out:
- 	if (name)
- 		rst_put_name(name, ctx);
-+	rst_creds_restore_current();
- 	return file;
- 
- err_put:
-@@ -1067,6 +1098,7 @@ err_put:
- err_out:
- 	if (name)
- 		rst_put_name(name, ctx);
-+	rst_creds_restore_current();
- 	return ERR_PTR(err);
- }
- 



More information about the pve-devel mailing list