git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
security
/
keys
/
proc.c
diff --git
a/security/keys/proc.c
b/security/keys/proc.c
index
6941260
..
f619170
100644
(file)
--- a/
security/keys/proc.c
+++ b/
security/keys/proc.c
@@
-70,19
+70,15
@@
static int __init key_proc_init(void)
struct proc_dir_entry *p;
#ifdef CONFIG_KEYS_DEBUG_PROC_KEYS
struct proc_dir_entry *p;
#ifdef CONFIG_KEYS_DEBUG_PROC_KEYS
- p =
create_proc_entry("keys", 0, NULL
);
+ p =
proc_create("keys", 0, NULL, &proc_keys_fops
);
if (!p)
panic("Cannot create /proc/keys\n");
if (!p)
panic("Cannot create /proc/keys\n");
-
- p->proc_fops = &proc_keys_fops;
#endif
#endif
- p =
create_proc_entry("key-users", 0, NULL
);
+ p =
proc_create("key-users", 0, NULL, &proc_key_users_fops
);
if (!p)
panic("Cannot create /proc/key-users\n");
if (!p)
panic("Cannot create /proc/key-users\n");
- p->proc_fops = &proc_key_users_fops;
-
return 0;
} /* end key_proc_init() */
return 0;
} /* end key_proc_init() */
@@
-246,6
+242,10
@@
static int proc_key_users_show(struct seq_file *m, void *v)
{
struct rb_node *_p = v;
struct key_user *user = rb_entry(_p, struct key_user, node);
{
struct rb_node *_p = v;
struct key_user *user = rb_entry(_p, struct key_user, node);
+ unsigned maxkeys = (user->uid == 0) ?
+ key_quota_root_maxkeys : key_quota_maxkeys;
+ unsigned maxbytes = (user->uid == 0) ?
+ key_quota_root_maxbytes : key_quota_maxbytes;
seq_printf(m, "%5u: %5d %d/%d %d/%d %d/%d\n",
user->uid,
seq_printf(m, "%5u: %5d %d/%d %d/%d %d/%d\n",
user->uid,
@@
-253,10
+253,9
@@
static int proc_key_users_show(struct seq_file *m, void *v)
atomic_read(&user->nkeys),
atomic_read(&user->nikeys),
user->qnkeys,
atomic_read(&user->nkeys),
atomic_read(&user->nikeys),
user->qnkeys,
-
KEYQUOTA_MAX_KEYS
,
+
maxkeys
,
user->qnbytes,
user->qnbytes,
- KEYQUOTA_MAX_BYTES
- );
+ maxbytes);
return 0;
return 0;