Hi,
On Tue, Jan 15, 2008 at 02:36:59PM -0600, [EMAIL PROTECTED] wrote:
> > + rcu_read_lock();
> > + if (lock_task_sighand(p, &flags)) {
> > + for (i=0; i<RLIM_NLIMITS; i++)
> > + rlim[i] = p->signal->rlim[i];
>
> I'm confused - where do you unlock_task_sighand()?
oh fsck! thanks for that pointer..
Here is a new version of the patch which solves this issue and the issues
adressed earlier in this thread by kosaki.
yours,
- clifford
Signed-off-by: Clifford Wolf <[EMAIL PROTECTED]>
--- linux/fs/proc/array.c (revision 750)
+++ linux/fs/proc/array.c (revision 764)
@@ -239,6 +239,58 @@
}
}
+static char *rlim_names[RLIM_NLIMITS] = {
+ [RLIMIT_CPU] = "CPU",
+ [RLIMIT_FSIZE] = "FSize",
+ [RLIMIT_DATA] = "Data",
+ [RLIMIT_STACK] = "Stack",
+ [RLIMIT_CORE] = "Core",
+ [RLIMIT_RSS] = "RSS",
+ [RLIMIT_NPROC] = "NProc",
+ [RLIMIT_NOFILE] = "NoFile",
+ [RLIMIT_MEMLOCK] = "MemLock",
+ [RLIMIT_AS] = "AddrSpace",
+ [RLIMIT_LOCKS] = "Locks",
+ [RLIMIT_SIGPENDING] = "SigPending",
+ [RLIMIT_MSGQUEUE] = "MsgQueue",
+ [RLIMIT_NICE] = "Nice",
+ [RLIMIT_RTPRIO] = "RTPrio"
+};
+
+#if RLIM_NLIMITS != 15
+# error Value of RLIM_NLIMITS changed. \
+ Please update rlim_names in fs/proc/array.c
+#endif
+
+static inline char *task_rlim(struct task_struct *p, char *buffer)
+{
+ unsigned long flags;
+ struct rlimit rlim[RLIM_NLIMITS];
+ int i;
+
+ rcu_read_lock();
+ if (lock_task_sighand(p, &flags)) {
+ for (i=0; i<RLIM_NLIMITS; i++)
+ rlim[i] = p->signal->rlim[i];
+ unlock_task_sighand(p, &flags);
+ }
+ rcu_read_unlock();
+
+ for (i=0; i<RLIM_NLIMITS; i++) {
+ buffer += sprintf(buffer, "Rlim%s:\t", rlim_names[i]);
+ if (rlim[i].rlim_cur != RLIM_INFINITY)
+ buffer += sprintf(buffer, "%lu\t", rlim[i].rlim_cur);
+ else
+ buffer += sprintf(buffer, "inf\t");
+ if (rlim[i].rlim_max != RLIM_INFINITY)
+ buffer += sprintf(buffer, "%lu\n", rlim[i].rlim_max);
+ else
+ buffer += sprintf(buffer, "inf\n");
+ }
+
+ return buffer;
+}
+
static inline char *task_sig(struct task_struct *p, char *buffer)
{
unsigned long flags;
@@ -310,6 +362,7 @@
buffer = task_mem(mm, buffer);
mmput(mm);
}
+ buffer = task_rlim(task, buffer);
buffer = task_sig(task, buffer);
buffer = task_cap(task, buffer);
buffer = cpuset_task_status_allowed(task, buffer);
--
perl -le '$_=1;(1x$_)!~/^(11+)\1+$/&&print${_}while$_++<1000'|fmt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
