Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / net / sctp / objcnt.c

diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index 14e294e..f73ec0e 100644 (file)
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -83,13 +83,12 @@ static sctp_dbg_objcnt_entry_t sctp_dbg_objcnt[] = {
  */
 static int sctp_objcnt_seq_show(struct seq_file *seq, void *v)
 {
-       int i;
-       char temp[128];
+       int i, len;
 
        i = (int)*(loff_t *)v;
-       sprintf(temp, "%s: %d", sctp_dbg_objcnt[i].label,
-                               atomic_read(sctp_dbg_objcnt[i].counter));
-       seq_printf(seq, "%-127s\n", temp);
+       seq_printf(seq, "%s: %d%n", sctp_dbg_objcnt[i].label,
+                               atomic_read(sctp_dbg_objcnt[i].counter), &len);
+       seq_printf(seq, "%*s\n", 127 - len, "");
        return 0;
 }
 
@@ -132,12 +131,11 @@ void sctp_dbg_objcnt_init(void)
 {
        struct proc_dir_entry *ent;
 
-       ent = create_proc_entry("sctp_dbg_objcnt", 0, proc_net_sctp);
+       ent = proc_create("sctp_dbg_objcnt", 0,
+                         proc_net_sctp, &sctp_objcnt_ops);
        if (!ent)
                printk(KERN_WARNING
                        "sctp_dbg_objcnt: Unable to create /proc entry.\n");
-       else
-               ent->proc_fops = &sctp_objcnt_ops;
 }
 
 /* Cleanup the objcount entry in the proc filesystem.  */