summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-08-06 08:54:11 -0400
committerSteve Dickson <steved@redhat.com>2012-08-06 09:11:27 -0400
commit6019ff50055ee189557b55aad781bb12beb95e19 (patch)
treec082a2ee39f1d60dfa2226ce85135ba3c27c2013
parentb0b342201140530c5b9e00408f12d22258df7c4e (diff)
downloadnfs-utils-6019ff50055ee189557b55aad781bb12beb95e19.zip
nfs-utils-6019ff50055ee189557b55aad781bb12beb95e19.tar.gz
nfs-utils-6019ff50055ee189557b55aad781bb12beb95e19.tar.xz
rpc.gssd: simplify signal handling
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>
-rw-r--r--utils/gssd/gssd_main_loop.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/utils/gssd/gssd_main_loop.c b/utils/gssd/gssd_main_loop.c
index c18e12c..9954ffb 100644
--- a/utils/gssd/gssd_main_loop.c
+++ b/utils/gssd/gssd_main_loop.c
@@ -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... */