Merge /spare/repo/linux-2.6/

6 files changed, 248 insertions, 169 deletions

diff --git a/ipc/compat.c b/ipc/compat.c
index 3881d564c668..1fe95f6659dd 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -42,10 +42,10 @@ struct compat_msgbuf {
 
 struct compat_ipc_perm {
         key_t key;
-        compat_uid_t uid;
-        compat_gid_t gid;
-        compat_uid_t cuid;
-        compat_gid_t cgid;
+        __compat_uid_t uid;
+        __compat_gid_t gid;
+        __compat_uid_t cuid;
+        __compat_gid_t cgid;
         compat_mode_t mode;
         unsigned short seq;
 };
@@ -174,8 +174,8 @@ static inline int __put_compat_ipc_perm(struct ipc64_perm *p,
                                         struct compat_ipc_perm __user *up)
 {
         int err;
-        compat_uid_t u;
-        compat_gid_t g;
+        __compat_uid_t u;
+        __compat_gid_t g;
 
         err  = __put_user(p->key, &up->key);
         SET_UID(u, p->uid);
diff --git a/ipc/msg.c b/ipc/msg.c
index 27e516f96cdc..d035bd2aba96 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -26,6 +26,7 @@
 #include <linux/sched.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
+#include <linux/seq_file.h>
 #include <asm/current.h>
 #include <asm/uaccess.h>
 #include "util.h"
@@ -74,16 +75,16 @@ static struct ipc_ids msg_ids;
 static void freeque (struct msg_queue *msq, int id);
 static int newque (key_t key, int msgflg);
 #ifdef CONFIG_PROC_FS
-static int sysvipc_msg_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
+static int sysvipc_msg_proc_show(struct seq_file *s, void *it);
 #endif
 
 void __init msg_init (void)
 {
         ipc_init_ids(&msg_ids,msg_ctlmni);
-
-#ifdef CONFIG_PROC_FS
-        create_proc_read_entry("sysvipc/msg", 0, NULL, sysvipc_msg_read_proc, NULL);
-#endif
+        ipc_init_proc_interface("sysvipc/msg",
+                                "       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n",
+                                &msg_ids,
+                                sysvipc_msg_proc_show);
 }
 
 static int newque (key_t key, int msgflg)
@@ -113,6 +114,7 @@ static int newque (key_t key, int msgflg)
                 return -ENOSPC;
         }
 
+        msq->q_id = msg_buildid(id,msq->q_perm.seq);
         msq->q_stime = msq->q_rtime = 0;
         msq->q_ctime = get_seconds();
         msq->q_cbytes = msq->q_qnum = 0;
@@ -123,7 +125,7 @@ static int newque (key_t key, int msgflg)
         INIT_LIST_HEAD(&msq->q_senders);
         msg_unlock(msq);
 
-        return msg_buildid(id,msq->q_perm.seq);
+        return msq->q_id;
 }
 
 static inline void ss_add(struct msg_queue* msq, struct msg_sender* mss)
@@ -808,55 +810,25 @@ out_unlock:
 }
 
 #ifdef CONFIG_PROC_FS
-static int sysvipc_msg_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
+static int sysvipc_msg_proc_show(struct seq_file *s, void *it)
 {
-        off_t pos = 0;
-        off_t begin = 0;
-        int i, len = 0;
-
-        down(&msg_ids.sem);
-        len += sprintf(buffer, "       key      msqid perms      cbytes       qnum lspid lrpid   uid   gid  cuid  cgid      stime      rtime      ctime\n");
-
-        for(i = 0; i <= msg_ids.max_id; i++) {
-                struct msg_queue * msq;
-                msq = msg_lock(i);
-                if(msq != NULL) {
-                        len += sprintf(buffer + len, "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
-                                msq->q_perm.key,
-                                msg_buildid(i,msq->q_perm.seq),
-                                msq->q_perm.mode,
-                                msq->q_cbytes,
-                                msq->q_qnum,
-                                msq->q_lspid,
-                                msq->q_lrpid,
-                                msq->q_perm.uid,
-                                msq->q_perm.gid,
-                                msq->q_perm.cuid,
-                                msq->q_perm.cgid,
-                                msq->q_stime,
-                                msq->q_rtime,
-                                msq->q_ctime);
-                        msg_unlock(msq);
-
-                        pos += len;
-                        if(pos < offset) {
-                                len = 0;
-                                begin = pos;
-                        }
-                        if(pos > offset + length)
-                                goto done;
-                }
-
-        }
-        *eof = 1;
-done:
-        up(&msg_ids.sem);
-        *start = buffer + (offset - begin);
-        len -= (offset - begin);
-        if(len > length)
-                len = length;
-        if(len < 0)
-                len = 0;
-        return len;
+        struct msg_queue *msq = it;
+
+        return seq_printf(s,
+                          "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
+                          msq->q_perm.key,
+                          msq->q_id,
+                          msq->q_perm.mode,
+                          msq->q_cbytes,
+                          msq->q_qnum,
+                          msq->q_lspid,
+                          msq->q_lrpid,
+                          msq->q_perm.uid,
+                          msq->q_perm.gid,
+                          msq->q_perm.cuid,
+                          msq->q_perm.cgid,
+                          msq->q_stime,
+                          msq->q_rtime,
+                          msq->q_ctime);
 }
 #endif
diff --git a/ipc/sem.c b/ipc/sem.c
index 70975ce0784a..19af028a3e38 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -73,6 +73,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
+#include <linux/seq_file.h>
 #include <asm/uaccess.h>
 #include "util.h"
 
@@ -89,7 +90,7 @@ static struct ipc_ids sem_ids;
 static int newary (key_t, int, int);
 static void freeary (struct sem_array *sma, int id);
 #ifdef CONFIG_PROC_FS
-static int sysvipc_sem_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
+static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
 #endif
 
 #define SEMMSL_FAST     256 /* 512 bytes on stack */
@@ -116,10 +117,10 @@ void __init sem_init (void)
 {
         used_sems = 0;
         ipc_init_ids(&sem_ids,sc_semmni);
-
-#ifdef CONFIG_PROC_FS
-        create_proc_read_entry("sysvipc/sem", 0, NULL, sysvipc_sem_read_proc, NULL);
-#endif
+        ipc_init_proc_interface("sysvipc/sem",
+                                "       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n",
+                                &sem_ids,
+                                sysvipc_sem_proc_show);
 }
 
 /*
@@ -193,6 +194,7 @@ static int newary (key_t key, int nsems, int semflg)
         }
         used_sems += nsems;
 
+        sma->sem_id = sem_buildid(id, sma->sem_perm.seq);
         sma->sem_base = (struct sem *) &sma[1];
         /* sma->sem_pending = NULL; */
         sma->sem_pending_last = &sma->sem_pending;
@@ -201,7 +203,7 @@ static int newary (key_t key, int nsems, int semflg)
         sma->sem_ctime = get_seconds();
         sem_unlock(sma);
 
-        return sem_buildid(id, sma->sem_perm.seq);
+        return sma->sem_id;
 }
 
 asmlinkage long sys_semget (key_t key, int nsems, int semflg)
@@ -1328,50 +1330,21 @@ next_entry:
 }
 
 #ifdef CONFIG_PROC_FS
-static int sysvipc_sem_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
+static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
 {
-        off_t pos = 0;
-        off_t begin = 0;
-        int i, len = 0;
-
-        len += sprintf(buffer, "       key      semid perms      nsems   uid   gid  cuid  cgid      otime      ctime\n");
-        down(&sem_ids.sem);
-
-        for(i = 0; i <= sem_ids.max_id; i++) {
-                struct sem_array *sma;
-                sma = sem_lock(i);
-                if(sma) {
-                        len += sprintf(buffer + len, "%10d %10d  %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
-                                sma->sem_perm.key,
-                                sem_buildid(i,sma->sem_perm.seq),
-                                sma->sem_perm.mode,
-                                sma->sem_nsems,
-                                sma->sem_perm.uid,
-                                sma->sem_perm.gid,
-                                sma->sem_perm.cuid,
-                                sma->sem_perm.cgid,
-                                sma->sem_otime,
-                                sma->sem_ctime);
-                        sem_unlock(sma);
-
-                        pos += len;
-                        if(pos < offset) {
-                                len = 0;
-                                begin = pos;
-                        }
-                        if(pos > offset + length)
-                                goto done;
-                }
-        }
-        *eof = 1;
-done:
-        up(&sem_ids.sem);
-        *start = buffer + (offset - begin);
-        len -= (offset - begin);
-        if(len > length)
-                len = length;
-        if(len < 0)
-                len = 0;
-        return len;
+        struct sem_array *sma = it;
+
+        return seq_printf(s,
+                          "%10d %10d  %4o %10lu %5u %5u %5u %5u %10lu %10lu\n",
+                          sma->sem_perm.key,
+                          sma->sem_id,
+                          sma->sem_perm.mode,
+                          sma->sem_nsems,
+                          sma->sem_perm.uid,
+                          sma->sem_perm.gid,
+                          sma->sem_perm.cuid,
+                          sma->sem_perm.cgid,
+                          sma->sem_otime,
+                          sma->sem_ctime);
 }
 #endif
diff --git a/ipc/shm.c b/ipc/shm.c
index 1d6cf08d950b..dca90489e3b0 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -23,12 +23,12 @@
 #include <linux/init.h>
 #include <linux/file.h>
 #include <linux/mman.h>
-#include <linux/proc_fs.h>
 #include <linux/shmem_fs.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <linux/ptrace.h>
+#include <linux/seq_file.h>
 
 #include <asm/uaccess.h>
 
@@ -51,7 +51,7 @@ static int newseg (key_t key, int shmflg, size_t size);
 static void shm_open (struct vm_area_struct *shmd);
 static void shm_close (struct vm_area_struct *shmd);
 #ifdef CONFIG_PROC_FS
-static int sysvipc_shm_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
+static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
 #endif
 
 size_t  shm_ctlmax = SHMMAX;
@@ -63,9 +63,10 @@ static int shm_tot; /* total number of shared memory pages */
 void __init shm_init (void)
 {
         ipc_init_ids(&shm_ids, 1);
-#ifdef CONFIG_PROC_FS
-        create_proc_read_entry("sysvipc/shm", 0, NULL, sysvipc_shm_read_proc, NULL);
-#endif
+        ipc_init_proc_interface("sysvipc/shm",
+                                "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime\n",
+                                &shm_ids,
+                                sysvipc_shm_proc_show);
 }
 
 static inline int shm_checkid(struct shmid_kernel *s, int id)
@@ -869,63 +870,32 @@ asmlinkage long sys_shmdt(char __user *shmaddr)
 }
 
 #ifdef CONFIG_PROC_FS
-static int sysvipc_shm_read_proc(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
+static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
 {
-        off_t pos = 0;
-        off_t begin = 0;
-        int i, len = 0;
-
-        down(&shm_ids.sem);
-        len += sprintf(buffer, "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime\n");
+        struct shmid_kernel *shp = it;
+        char *format;
 
-        for(i = 0; i <= shm_ids.max_id; i++) {
-                struct shmid_kernel* shp;
-
-                shp = shm_lock(i);
-                if(shp!=NULL) {
 #define SMALL_STRING "%10d %10d  %4o %10u %5u %5u  %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
 #define BIG_STRING   "%10d %10d  %4o %21u %5u %5u  %5d %5u %5u %5u %5u %10lu %10lu %10lu\n"
-                        char *format;
 
-                        if (sizeof(size_t) <= sizeof(int))
-                                format = SMALL_STRING;
-                        else
-                                format = BIG_STRING;
-                        len += sprintf(buffer + len, format,
-                                shp->shm_perm.key,
-                                shm_buildid(i, shp->shm_perm.seq),
-                                shp->shm_flags,
-                                shp->shm_segsz,
-                                shp->shm_cprid,
-                                shp->shm_lprid,
-                                is_file_hugepages(shp->shm_file) ? (file_count(shp->shm_file) - 1) : shp->shm_nattch,
-                                shp->shm_perm.uid,
-                                shp->shm_perm.gid,
-                                shp->shm_perm.cuid,
-                                shp->shm_perm.cgid,
-                                shp->shm_atim,
-                                shp->shm_dtim,
-                                shp->shm_ctim);
-                        shm_unlock(shp);
-
-                        pos += len;
-                        if(pos < offset) {
-                                len = 0;
-                                begin = pos;
-                        }
-                        if(pos > offset + length)
-                                goto done;
-                }
-        }
-        *eof = 1;
-done:
-        up(&shm_ids.sem);
-        *start = buffer + (offset - begin);
-        len -= (offset - begin);
-        if(len > length)
-                len = length;
-        if(len < 0)
-                len = 0;
-        return len;
+        if (sizeof(size_t) <= sizeof(int))
+                format = SMALL_STRING;
+        else
+                format = BIG_STRING;
+        return seq_printf(s, format,
+                          shp->shm_perm.key,
+                          shp->id,
+                          shp->shm_flags,
+                          shp->shm_segsz,
+                          shp->shm_cprid,
+                          shp->shm_lprid,
+                          is_file_hugepages(shp->shm_file) ? (file_count(shp->shm_file) - 1) : shp->shm_nattch,
+                          shp->shm_perm.uid,
+                          shp->shm_perm.gid,
+                          shp->shm_perm.cuid,
+                          shp->shm_perm.cgid,
+                          shp->shm_atim,
+                          shp->shm_dtim,
+                          shp->shm_ctim);
 }
 #endif
diff --git a/ipc/util.c b/ipc/util.c
index e00c35f7b2b8..10e836d0d89e 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -24,11 +24,20 @@
 #include <linux/security.h>
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
+#include <linux/seq_file.h>
+#include <linux/proc_fs.h>
 
 #include <asm/unistd.h>
 
 #include "util.h"
 
+struct ipc_proc_iface {
+        const char *path;
+        const char *header;
+        struct ipc_ids *ids;
+        int (*show)(struct seq_file *, void *);
+};
+
 /**
  *      ipc_init        -       initialise IPC subsystem
  *
@@ -86,6 +95,43 @@ void __init ipc_init_ids(struct ipc_ids* ids, int size)
                 ids->entries->p[i] = NULL;
 }
 
+#ifdef CONFIG_PROC_FS
+static struct file_operations sysvipc_proc_fops;
+/**
+ *      ipc_init_proc_interface -  Create a proc interface for sysipc types
+ *                                 using a seq_file interface.
+ *      @path: Path in procfs
+ *      @header: Banner to be printed at the beginning of the file.
+ *      @ids: ipc id table to iterate.
+ *      @show: show routine.
+ */
+void __init ipc_init_proc_interface(const char *path, const char *header,
+                                    struct ipc_ids *ids,
+                                    int (*show)(struct seq_file *, void *))
+{
+        struct proc_dir_entry *pde;
+        struct ipc_proc_iface *iface;
+
+        iface = kmalloc(sizeof(*iface), GFP_KERNEL);
+        if (!iface)
+                return;
+        iface->path     = path;
+        iface->header   = header;
+        iface->ids      = ids;
+        iface->show     = show;
+
+        pde = create_proc_entry(path,
+                                S_IRUGO,        /* world readable */
+                                NULL            /* parent dir */);
+        if (pde) {
+                pde->data = iface;
+                pde->proc_fops = &sysvipc_proc_fops;
+        } else {
+                kfree(iface);
+        }
+}
+#endif
+
 /**
  *      ipc_findkey     -       find a key in an ipc identifier set     
  *      @ids: Identifier set
@@ -578,3 +624,113 @@ int ipc_parse_version (int *cmd)
 }
 
 #endif /* __ARCH_WANT_IPC_PARSE_VERSION */
+
+#ifdef CONFIG_PROC_FS
+static void *sysvipc_proc_next(struct seq_file *s, void *it, loff_t *pos)
+{
+        struct ipc_proc_iface *iface = s->private;
+        struct kern_ipc_perm *ipc = it;
+        loff_t p;
+
+        /* If we had an ipc id locked before, unlock it */
+        if (ipc && ipc != SEQ_START_TOKEN)
+                ipc_unlock(ipc);
+
+        /*
+         * p = *pos - 1 (because id 0 starts at position 1)
+         *          + 1 (because we increment the position by one)
+         */
+        for (p = *pos; p <= iface->ids->max_id; p++) {
+                if ((ipc = ipc_lock(iface->ids, p)) != NULL) {
+                        *pos = p + 1;
+                        return ipc;
+                }
+        }
+
+        /* Out of range - return NULL to terminate iteration */
+        return NULL;
+}
+
+/*
+ * File positions: pos 0 -> header, pos n -> ipc id + 1.
+ * SeqFile iterator: iterator value locked shp or SEQ_TOKEN_START.
+ */
+static void *sysvipc_proc_start(struct seq_file *s, loff_t *pos)
+{
+        struct ipc_proc_iface *iface = s->private;
+        struct kern_ipc_perm *ipc;
+        loff_t p;
+
+        /*
+         * Take the lock - this will be released by the corresponding
+         * call to stop().
+         */
+        down(&iface->ids->sem);
+
+        /* pos < 0 is invalid */
+        if (*pos < 0)
+                return NULL;
+
+        /* pos == 0 means header */
+        if (*pos == 0)
+                return SEQ_START_TOKEN;
+
+        /* Find the (pos-1)th ipc */
+        for (p = *pos - 1; p <= iface->ids->max_id; p++) {
+                if ((ipc = ipc_lock(iface->ids, p)) != NULL) {
+                        *pos = p + 1;
+                        return ipc;
+                }
+        }
+        return NULL;
+}
+
+static void sysvipc_proc_stop(struct seq_file *s, void *it)
+{
+        struct kern_ipc_perm *ipc = it;
+        struct ipc_proc_iface *iface = s->private;
+
+        /* If we had a locked segment, release it */
+        if (ipc && ipc != SEQ_START_TOKEN)
+                ipc_unlock(ipc);
+
+        /* Release the lock we took in start() */
+        up(&iface->ids->sem);
+}
+
+static int sysvipc_proc_show(struct seq_file *s, void *it)
+{
+        struct ipc_proc_iface *iface = s->private;
+
+        if (it == SEQ_START_TOKEN)
+                return seq_puts(s, iface->header);
+
+        return iface->show(s, it);
+}
+
+static struct seq_operations sysvipc_proc_seqops = {
+        .start = sysvipc_proc_start,
+        .stop  = sysvipc_proc_stop,
+        .next  = sysvipc_proc_next,
+        .show  = sysvipc_proc_show,
+};
+
+static int sysvipc_proc_open(struct inode *inode, struct file *file) {
+        int ret;
+        struct seq_file *seq;
+
+        ret = seq_open(file, &sysvipc_proc_seqops);
+        if (!ret) {
+                seq = file->private_data;
+                seq->private = PDE(inode)->data;
+        }
+        return ret;
+}
+
+static struct file_operations sysvipc_proc_fops = {
+        .open    = sysvipc_proc_open,
+        .read    = seq_read,
+        .llseek  = seq_lseek,
+        .release = seq_release,
+};
+#endif /* CONFIG_PROC_FS */
diff --git a/ipc/util.h b/ipc/util.h
index 44348ca5a707..fc9a28be0797 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -30,7 +30,15 @@ struct ipc_ids {
         struct ipc_id_ary* entries;
 };
 
+struct seq_file;
 void __init ipc_init_ids(struct ipc_ids* ids, int size);
+#ifdef CONFIG_PROC_FS
+void __init ipc_init_proc_interface(const char *path, const char *header,
+                                    struct ipc_ids *ids,
+                                    int (*show)(struct seq_file *, void *));
+#else
+#define ipc_init_proc_interface(path, header, ids, show) do {} while (0)
+#endif
 
 /* must be called with ids->sem acquired.*/
 int ipc_findkey(struct ipc_ids* ids, key_t key);