rename signalfd_siginfo fields

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>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/signalfd.c b/fs/signalfd.c
index aefb0be07942d735de747ad8697834368f8a907a..fb7f7e8034df512db10978276d7c2cf8f9cc0a75 100644 (file)
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -74,45 +74,45 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
         * 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, &uinfo->band);
-               err |= __put_user(kinfo->si_fd, &uinfo->fd);
+               err |= __put_user(kinfo->si_band, &uinfo->ssi_band);
+               err |= __put_user(kinfo->si_fd, &uinfo->ssi_fd);
                break;
        case __SI_FAULT:
-               err |= __put_user((long)kinfo->si_addr, &uinfo->addr);
+               err |= __put_user((long) kinfo->si_addr, &uinfo->ssi_addr);
 #ifdef __ARCH_SI_TRAPNO
-               err |= __put_user(kinfo->si_trapno, &uinfo->trapno);
+               err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno);
 #endif
                break;
        case __SI_CHLD:
-               err |= __put_user(kinfo->si_pid, &uinfo->pid);
-               err |= __put_user(kinfo->si_uid, &uinfo->uid);
-               err |= __put_user(kinfo->si_status, &uinfo->status);
-               err |= __put_user(kinfo->si_utime, &uinfo->utime);
-               err |= __put_user(kinfo->si_stime, &uinfo->stime);
+               err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid);
+               err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid);
+               err |= __put_user(kinfo->si_status, &uinfo->ssi_status);
+               err |= __put_user(kinfo->si_utime, &uinfo->ssi_utime);
+               err |= __put_user(kinfo->si_stime, &uinfo->ssi_stime);
                break;
        case __SI_RT: /* This is not generated by the kernel as of now. */
        case __SI_MESGQ: /* But this is */
-               err |= __put_user(kinfo->si_pid, &uinfo->pid);
-               err |= __put_user(kinfo->si_uid, &uinfo->uid);
-               err |= __put_user((long)kinfo->si_ptr, &uinfo->svptr);
+               err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid);
+               err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid);
+               err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr);
                break;
        default: /* this is just in case for now ... */
-               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;
        }
 

diff --git a/include/linux/signalfd.h b/include/linux/signalfd.h
index 4c9ff0910ae01d39f691a23c9acf5d1db48b06d2..86f9b1ef0e0934c9a354b44a67ab396be61ccbe4 100644 (file)
--- a/include/linux/signalfd.h
+++ b/include/linux/signalfd.h
@@ -10,22 +10,22 @@
 
 
 struct signalfd_siginfo {
-       __u32 signo;
-       __s32 err;
-       __s32 code;
-       __u32 pid;
-       __u32 uid;
-       __s32 fd;
-       __u32 tid;
-       __u32 band;
-       __u32 overrun;
-       __u32 trapno;
-       __s32 status;
-       __s32 svint;
-       __u64 svptr;
-       __u64 utime;
-       __u64 stime;
-       __u64 addr;
+       __u32 ssi_signo;
+       __s32 ssi_errno;
+       __s32 ssi_code;
+       __u32 ssi_pid;
+       __u32 ssi_uid;
+       __s32 ssi_fd;
+       __u32 ssi_tid;
+       __u32 ssi_band;
+       __u32 ssi_overrun;
+       __u32 ssi_trapno;
+       __s32 ssi_status;
+       __s32 ssi_int;
+       __u64 ssi_ptr;
+       __u64 ssi_utime;
+       __u64 ssi_stime;
+       __u64 ssi_addr;
 
        /*
         * Pad strcture to 128 bytes. Remember to update the