*/
#include <linux/config.h>
+#include <linux/module.h>
#include <linux/vserver/limit.h>
#include <linux/vserver/context.h>
#include <linux/vserver/switch.h>
[VLIMIT_NSOCK] = "NSOCK",
};
+EXPORT_SYMBOL_GPL(vlimit_name);
+
static int is_valid_rlimit(int id)
{
limit = vxi->limit.rlim[id];
if (limit == RLIM_INFINITY)
return CRLIM_INFINITY;
- return limit;
+ return limit;
}
int vc_get_rlimit(uint32_t id, void __user *data)
return -EFAULT;
if (!is_valid_rlimit(vc_data.id))
return -ENOTSUPP;
-
+
vxi = locate_vx_info(id);
if (!vxi)
return -ESRCH;
if (vc_data.maximum != CRLIM_KEEP)
vxi->limit.rlim[vc_data.id] = vc_data.maximum;
- printk("setting [%d] = %d\n", vc_data.id, (int)vc_data.maximum);
put_vx_info(vxi);
return 0;
if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
return -EPERM;
if (copy_to_user(data, &mask, sizeof(mask)))
- return -EFAULT;
+ return -EFAULT;
return 0;
}
v = atomic_read(&vxi->limit.rcur[RLIMIT_RSS]);
val->freeram = (v < val->totalram) ? val->totalram - v : 0;
val->bufferram = 0;
- val->totalhigh = 0;
- val->freehigh = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
return;
}
void vx_vsi_swapinfo(struct sysinfo *val)
{
struct vx_info *vxi = current->vx_info;
- unsigned long w,v;
+ unsigned long v, w;
v = vxi->limit.rlim[RLIMIT_RSS];
w = vxi->limit.rlim[RLIMIT_AS];