For Michael Kerrisk request, the following patch renames signalfd_siginfo

fields in order to keep them consistent with the siginfo_t ones.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
- Davide
---

 fs/signalfd.c            |   44 ++++++++++++++++++++++----------------------

 include/linux/signalfd.h |   32 ++++++++++++++++----------------

 2 files changed, 38 insertions(+), 38 deletions(-)
Index: linux-2.6.mod/fs/signalfd.c

===================================================================

--- linux-2.6.mod.orig/fs/signalfd.c	2007-09-27 10:31:48.000000000 -0700

+++ linux-2.6.mod/fs/signalfd.c	2007-09-27 10:33:45.000000000 -0700

@@ -74,45 +74,45 @@

 	 * If you change siginfo_t structure, please be sure

 	 * this code is fixed accordingly.

 	 */

-	err |= __put_user(kinfo->si_signo, &uinfo->signo);

-	err |= __put_user(kinfo->si_errno, &uinfo->err);

-	err |= __put_user((short)kinfo->si_code, &uinfo->code);

+	err |= __put_user(kinfo->si_signo, &uinfo->ssi_signo);

+	err |= __put_user(kinfo->si_errno, &uinfo->ssi_errno);

+	err |= __put_user((short) kinfo->si_code, &uinfo->ssi_code);

 	switch (kinfo->si_code & __SI_MASK) {

 	case __SI_KILL:

-		err |= __put_user(kinfo->si_pid, &uinfo->pid);

-		err |= __put_user(kinfo->si_uid, &uinfo->uid);

+		err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid);

+		err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid);

 		break;

 	case __SI_TIMER:

-		 err |= __put_user(kinfo->si_tid, &uinfo->tid);

-		 err |= __put_user(kinfo->si_overrun, &uinfo->overrun);

-		 err |= __put_user((long)kinfo->si_ptr, &uinfo->svptr);

+		 err |= __put_user(kinfo->si_tid, &uinfo->ssi_tid);

+		 err |= __put_user(kinfo->si_overrun, &uinfo->ssi_overrun);

+		 err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr);

 		break;

 	case __SI_POLL:

-		err |= __put_user(kinfo->si_band, &...
[ message continues ]