From: Planet-Lab Support Date: Mon, 8 Aug 2005 21:12:13 +0000 (+0000) Subject: This commit was manufactured by cvs2svn to create tag X-Git-Tag: after-ckrm_E17-mem-revert^0 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fa1e4173c7949f51289f9e183ef530403e536309;p=linux-2.6.git This commit was manufactured by cvs2svn to create tag 'after-ckrm_E17-mem-revert'. --- diff --git a/configs/kernel-2.6.10-i686-planetlab.config b/configs/kernel-2.6.10-i686-planetlab.config index bd63671f1..4e9ddc572 100644 --- a/configs/kernel-2.6.10-i686-planetlab.config +++ b/configs/kernel-2.6.10-i686-planetlab.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.10-1.14_FC2.1.planetlab.2005.04.14 -# Sat May 7 01:45:01 2005 +# Mon Apr 18 17:24:00 2005 # CONFIG_X86=y CONFIG_MMU=y @@ -33,10 +33,9 @@ CONFIG_CKRM=y CONFIG_RCFS_FS=y CONFIG_CKRM_TYPE_TASKCLASS=y CONFIG_CKRM_RES_NULL=m -# CONFIG_CKRM_RES_MEM is not set +CONFIG_CKRM_RES_MEM=y # CONFIG_CKRM_TYPE_SOCKETCLASS is not set -CONFIG_CKRM_RES_NUMTASKS=y -# CONFIG_CKRM_RES_NUMTASKS_FORKRATE is not set +# CONFIG_CKRM_RES_NUMTASKS is not set CONFIG_CKRM_CPU_SCHEDULE=y # CONFIG_CKRM_RES_BLKIO is not set CONFIG_CKRM_CPU_SCHEDULE_AT_BOOT=y diff --git a/fs/posix_acl.c b/fs/posix_acl.c index 9c676901a..97fbb8619 100644 --- a/fs/posix_acl.c +++ b/fs/posix_acl.c @@ -215,10 +215,6 @@ posix_acl_permission(struct inode *inode, const struct posix_acl *acl, int want) const struct posix_acl_entry *pa, *pe, *mask_obj; int found = 0; - /* Prevent vservers from escaping chroot() barriers */ - if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN)) - return -EACCES; - FOREACH_ACL_ENTRY(pa, acl, pe) { switch(pa->e_tag) { case ACL_USER_OBJ: diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h index 12788c896..a9858024b 100644 --- a/include/linux/ext2_fs.h +++ b/include/linux/ext2_fs.h @@ -197,8 +197,8 @@ struct ext2_group_desc #define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ #ifdef CONFIG_VSERVER_LEGACY -#define EXT2_FL_USER_VISIBLE 0x0C03DFFF /* User visible flags */ -#define EXT2_FL_USER_MODIFIABLE 0x0C0380FF /* User modifiable flags */ +#define EXT2_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */ +#define EXT2_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */ #else #define EXT2_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ #define EXT2_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h index 818516b81..f2d1cd9fa 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h @@ -190,8 +190,8 @@ struct ext3_group_desc #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */ #ifdef CONFIG_VSERVER_LEGACY -#define EXT3_FL_USER_VISIBLE 0x0C03DFFF /* User visible flags */ -#define EXT3_FL_USER_MODIFIABLE 0x0C0380FF /* User modifiable flags */ +#define EXT3_FL_USER_VISIBLE 0x0803DFFF /* User visible flags */ +#define EXT3_FL_USER_MODIFIABLE 0x080380FF /* User modifiable flags */ #else #define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ diff --git a/kernel/ckrm/ckrm_cpu_class.c b/kernel/ckrm/ckrm_cpu_class.c index 929c22d97..301ccbb89 100644 --- a/kernel/ckrm/ckrm_cpu_class.c +++ b/kernel/ckrm/ckrm_cpu_class.c @@ -145,8 +145,6 @@ static void ckrm_free_cpu_class(void *my_res) struct ckrm_cpu_class *cls = my_res, *parres, *childres; ckrm_core_class_t *child = NULL; int maxlimit; - ckrm_lrq_t* queue; - int i; if (!cls) return; @@ -154,15 +152,6 @@ static void ckrm_free_cpu_class(void *my_res) /*the default class can't be freed*/ if (cls == get_default_cpu_class()) return; -#if 1 -#warning "ACB: Remove freed class from any classqueues [PL #4233]" - for (i = 0 ; i < NR_CPUS ; i++) { - queue = &cls->local_queues[i]; - if (cls_in_classqueue(&queue->classqueue_linkobj)) - classqueue_dequeue(queue->classqueue, - &queue->classqueue_linkobj); - } -#endif // Assuming there will be no children when this function is called parres = ckrm_get_cpu_class(cls->parent); diff --git a/kernel/ckrm/ckrm_cpu_monitor.c b/kernel/ckrm/ckrm_cpu_monitor.c index 5f59b375e..3e18c9753 100644 --- a/kernel/ckrm/ckrm_cpu_monitor.c +++ b/kernel/ckrm/ckrm_cpu_monitor.c @@ -841,9 +841,8 @@ static void adjust_lrq_weight(struct ckrm_cpu_class *clsptr, int cpu_online) total_pressure += lrq->lrq_load; } -#define FIX_SHARES -#ifdef FIX_SHARES -#warning "ACB: fix share initialization problem [PL #4227]" +#if 1 +#warning "ACB taking out suspicious early return" #else if (! total_pressure) return; @@ -860,10 +859,6 @@ static void adjust_lrq_weight(struct ckrm_cpu_class *clsptr, int cpu_online) /*give idle class a high share to boost interactiveness */ lw = cpu_class_weight(clsptr); else { -#ifdef FIX_SHARES - if (! total_pressure) - return; -#endif lw = lrq->lrq_load * class_weight; do_div(lw,total_pressure); if (!lw) diff --git a/kernel/ckrm/ckrm_mem.c b/kernel/ckrm/ckrm_mem.c index 736b579c7..f23ddeb18 100644 --- a/kernel/ckrm/ckrm_mem.c +++ b/kernel/ckrm/ckrm_mem.c @@ -165,10 +165,8 @@ check_memclass(struct ckrm_mem_res *res, char *str) struct list_head *pos; struct page *page; -#if 0 printk("Check<%s> %s: total=%d\n", str, res->core->name, atomic_read(&res->pg_total)); -#endif for (i = 0; i < MAX_NR_ZONES; i++) { act = 0; inact = 0; ckrm_zone = &res->ckrm_zone[i]; @@ -187,11 +185,9 @@ check_memclass(struct ckrm_mem_res *res, char *str) act++; } spin_unlock_irq(&zone->lru_lock); -#if 0 printk("Check<%s>(zone=%d): act %ld, inae %ld lact %d lina %d\n", str, i, ckrm_zone->nr_active, ckrm_zone->nr_inactive, act, inact); -#endif } } EXPORT_SYMBOL_GPL(check_memclass); diff --git a/scripts/kernel-2.6-planetlab.spec b/scripts/kernel-2.6-planetlab.spec index e516b27d7..ca2935d13 100644 --- a/scripts/kernel-2.6-planetlab.spec +++ b/scripts/kernel-2.6-planetlab.spec @@ -22,7 +22,7 @@ Summary: The Linux kernel (the core of the Linux operating system) %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root ] && echo || echo .`whoami`) -%define release 1.14_FC2.2.planetlab%{?date:.%{date}} +%define release 1.14_FC2.1.planetlab%{?date:.%{date}} %define signmodules 0 %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}