[kernel] r8290 - in dists/trunk/linux-2.6/debian/patches: features/all/vserver series

[Bastian Blank]

Author: waldi
Date: Thu Feb  8 11:02:54 2007
New Revision: 8290

Modified:
   dists/trunk/linux-2.6/debian/patches/features/all/vserver/bindmount-dev.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
Log:
* debian/patches/features/all/vserver/bindmount-dev.patch: Rediff.
* debian/patches/series/1~experimental.1-extra: Update.


Modified: dists/trunk/linux-2.6/debian/patches/features/all/vserver/bindmount-dev.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/vserver/bindmount-dev.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/features/all/vserver/bindmount-dev.patch	Thu Feb  8 11:02:54 2007
@@ -1,7 +1,6 @@
-diff -ur source-s390-vserver.orig/fs/namespace.c source-s390-vserver/fs/namespace.c
---- source-s390-vserver.orig/fs/namespace.c	2006-08-12 16:51:51.000000000 +0200
-+++ source-s390-vserver/fs/namespace.c	2006-08-12 16:53:26.000000000 +0200
-@@ -986,6 +986,9 @@
+--- a/fs/namespace.c	2007-02-07 14:15:28.000000000 +0100
++++ b/fs/namespace.c	2007-02-08 10:57:40.000000000 +0100
+@@ -988,6 +988,9 @@ static int do_loopback(struct nameidata 
  	if (!mnt)
  		goto out;
  
@@ -9,9 +8,9 @@
 +		mnt_flags |= MNT_NODEV;
 +
  	mnt->mnt_flags = mnt_flags;
- 	if (flags & MS_XID) {
- 		mnt->mnt_xid = xid;
-@@ -1028,6 +1031,9 @@
+ 	if (flags & MS_TAGID) {
+ 		mnt->mnt_tag = tag;
+@@ -1030,6 +1033,9 @@ static int do_remount(struct nameidata *
  	if (nd->dentry != nd->mnt->mnt_root)
  		return -EINVAL;
  
@@ -21,7 +20,7 @@
  	down_write(&sb->s_umount);
  	err = do_remount_sb(sb, flags, data, 0);
  	if (!err)
-@@ -1136,6 +1142,9 @@
+@@ -1138,6 +1144,9 @@ static int do_new_mount(struct nameidata
  	if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT))
  		return -EPERM;
  
@@ -31,12 +30,12 @@
  	mnt = do_kern_mount(type, flags, name, data);
  	if (IS_ERR(mnt))
  		return PTR_ERR(mnt);
-@@ -1409,8 +1418,6 @@
- 	if (flags & MS_NODIRATIME)
- 		mnt_flags |= MNT_NODIRATIME;
+@@ -1489,8 +1498,6 @@ long do_mount(char *dev_name, char *dir_
+ 	if (flags & MS_RELATIME)
+ 		mnt_flags |= MNT_RELATIME;
  
 -	if (!capable(CAP_SYS_ADMIN))
 -		mnt_flags |= MNT_NODEV;
  	flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE |
- 		   MS_NOATIME | MS_NODIRATIME);
+ 		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME);
  

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Thu Feb  8 11:02:54 2007
@@ -1,5 +1,5 @@
 + features/all/vserver/vs2.2.0-pre1.patch *_vserver *_xen-vserver
-#+ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
++ features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
 + features/all/xen/vserver-clash.patch *_xen-vserver
 #+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
 + features/all/xen/vserver-update.patch *_xen-vserver