diff options
| author |   Christian Heim <phreak@gentoo.org> | 2005-11-25 13:17:12 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2005-11-25 13:17:12 +0000 |
| commit | 9bed5d42135b664bb354963126c9bde7d141e799 (patch) | |
| tree | c128b69a01aac91d25b335fd9f2773262d28a72f /vserver-sources/2.1.0_rc8 | |
| parent | Adding patchset dir for openvz-sources-022.045-r1 (diff) | |
| download | misc-9bed5d42135b664bb354963126c9bde7d141e799.tar.gz misc-9bed5d42135b664bb354963126c9bde7d141e799.tar.bz2 misc-9bed5d42135b664bb354963126c9bde7d141e799.zip | |
Bumping vserver-sources wrt. Linux-2.6.14.3
svn path=/; revision=101
Diffstat (limited to 'vserver-sources/2.1.0_rc8')
| -rw-r--r-- | vserver-sources/2.1.0_rc8/4912_vs2.1.0-rc8-vroot-clean02.patch | 30 | ||||
| -rw-r--r-- | vserver-sources/2.1.0_rc8/4913_vs2.1.0-rc8-vroot-fix03.patch | 22 |
2 files changed, 52 insertions, 0 deletions
diff --git a/vserver-sources/2.1.0_rc8/4912_vs2.1.0-rc8-vroot-clean02.patch b/vserver-sources/2.1.0_rc8/4912_vs2.1.0-rc8-vroot-clean02.patch new file mode 100644 index 0000000..62b8020 --- /dev/null +++ b/vserver-sources/2.1.0_rc8/4912_vs2.1.0-rc8-vroot-clean02.patch @@ -0,0 +1,30 @@ +diff -NurpP --minimal linux-2.6.14.2-vs2.1.0-rc7.10/drivers/block/vroot.c linux-2.6.14.2-vs2.1.0-rc8/drivers/block/vroot.c +--- linux-2.6.14.2-vs2.1.0-rc7.10/drivers/block/vroot.c 2005-11-20 21:38:02 +0100 ++++ linux-2.6.14.2-vs2.1.0-rc8/drivers/block/vroot.c 2005-11-21 22:11:40 +0100 +@@ -62,7 +62,7 @@ static int vroot_set_dev( + goto out_fput; + + vxdprintk(VXD_CBIT(misc, 0), +- "vroot[%d]_set_dev: dev=" VXF_DEV "\n", ++ "vroot[%d]_set_dev: dev=" VXF_DEV, + vr->vr_number, VXD_DEV(real_bdev)); + + vr->vr_state = Vr_bound; +@@ -89,7 +89,7 @@ static int vroot_clr_dev( + real_bdev = vr->vr_device; + + vxdprintk(VXD_CBIT(misc, 0), +- "vroot[%d]_clr_dev: dev=" VXF_DEV "\n", ++ "vroot[%d]_clr_dev: dev=" VXF_DEV, + vr->vr_number, VXD_DEV(real_bdev)); + + bdput(real_bdev); +@@ -159,7 +159,7 @@ struct block_device *__vroot_get_real_bd + real_bdev = vr->vr_device; + + vxdprintk(VXD_CBIT(misc, 0), +- "vroot[%d]_get_real_bdev: dev=" VXF_DEV "\n", ++ "vroot[%d]_get_real_bdev: dev=" VXF_DEV, + vr->vr_number, VXD_DEV(real_bdev)); + + if (vr->vr_state != Vr_bound) diff --git a/vserver-sources/2.1.0_rc8/4913_vs2.1.0-rc8-vroot-fix03.patch b/vserver-sources/2.1.0_rc8/4913_vs2.1.0-rc8-vroot-fix03.patch new file mode 100644 index 0000000..61ef284 --- /dev/null +++ b/vserver-sources/2.1.0_rc8/4913_vs2.1.0-rc8-vroot-fix03.patch @@ -0,0 +1,22 @@ +diff -NurpP --minimal linux-2.6.14.2-vs2.1.0-rc8/fs/quota.c linux-2.6.14.2-vs2.1.0-rc8.1/fs/quota.c +--- linux-2.6.14.2-vs2.1.0-rc8/fs/quota.c 2005-11-20 22:04:16 +0100 ++++ linux-2.6.14.2-vs2.1.0-rc8.1/fs/quota.c 2005-11-22 01:28:58 +0100 +@@ -398,13 +398,16 @@ asmlinkage long sys_quotactl(unsigned in + putname(tmp); + if (IS_ERR(bdev)) + return PTR_ERR(bdev); +-#ifdef CONFIG_BLK_DEV_VROOT +- if (bdev && bdev->bd_inode && vroot_get_real_bdev && ++#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE) ++ if (bdev && bdev->bd_inode && + imajor(bdev->bd_inode) == VROOT_MAJOR) { + struct block_device *bdnew = (void *)-EINVAL; + + if (vroot_get_real_bdev) + bdnew = vroot_get_real_bdev(bdev); ++ else ++ vxdprintk(VXD_CBIT(misc, 0), ++ "vroot_get_real_bdev not set"); + + bdput(bdev); + if (IS_ERR(bdnew)) |