]> git.decadent.org.uk Git - nfs-utils.git/commitdiff
rpc.gssd: simplify signal handling
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 6 Aug 2012 12:54:11 +0000 (08:54 -0400)
committerSteve Dickson <steved@redhat.com>
Mon, 6 Aug 2012 13:11:27 +0000 (09:11 -0400)
From: "J. Bruce Fields" <bfields@redhat.com>

We're not actually using the extra sa_sigaction parameters.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
utils/gssd/gssd_main_loop.c

index c18e12c37c60cba220424c47ee1cafb0e8adb00c..9954ffb0c2a3f3c2c9ecd0158001cd4c809ade02 100644 (file)
@@ -61,9 +61,9 @@ extern int pollsize;
 
 static volatile int dir_changed = 1;
 
-static void dir_notify_handler(int sig, siginfo_t *si, void *data)
+static void dir_notify_handler(int sig)
 {
-       printerr(2, "dir_notify_handler: sig %d si %p data %p\n", sig, si, data);
+       printerr(2, "dir_notify_handler: sig %d\n", sig);
 
        dir_changed = 1;
 }
@@ -183,13 +183,12 @@ void
 gssd_run()
 {
        int                     ret;
-       struct sigaction        dn_act;
+       struct sigaction        dn_act = {
+               .sa_handler = dir_notify_handler
+       };
        sigset_t                set;
 
-       /* Taken from linux/Documentation/dnotify.txt: */
-       dn_act.sa_sigaction = dir_notify_handler;
        sigemptyset(&dn_act.sa_mask);
-       dn_act.sa_flags = SA_SIGINFO;
        sigaction(DNOTIFY_SIGNAL, &dn_act, NULL);
 
        /* just in case the signal is blocked... */