From: "J. Bruce Fields" <bfields@redhat.com>
To: Steve Dickson <SteveD@redhat.com>
Cc: Jim Rees <rees@umich.edu>,
linux-nfs@vger.kernel.org, "J. Bruce Fields" <bfields@redhat.com>
Subject: [PATCH 3/4] rpc.gssd: handle error to open toplevel directory
Date: Tue, 31 Jul 2012 17:00:48 -0400 [thread overview]
Message-ID: <1343768449-32205-3-git-send-email-bfields@redhat.com> (raw)
In-Reply-To: <20120731205931.GA32161@fieldses.org>
From: "J. Bruce Fields" <bfields@redhat.com>
Reverse the sense of the test here, and also add debugging and cleanup
in the error case.
(Though the lack of cleanup isn't currently a problem in practice since
we'll eventually exit in this case.)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
utils/gssd/gssd_main_loop.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/utils/gssd/gssd_main_loop.c b/utils/gssd/gssd_main_loop.c
index 6914687..142c8c5 100644
--- a/utils/gssd/gssd_main_loop.c
+++ b/utils/gssd/gssd_main_loop.c
@@ -121,11 +121,13 @@ topdirs_add_entry(struct dirent *dent)
}
snprintf(tdi->dirname, PATH_MAX, "%s/%s", pipefs_dir, dent->d_name);
tdi->fd = open(tdi->dirname, O_RDONLY);
- if (tdi->fd != -1) {
- fcntl(tdi->fd, F_SETSIG, DNOTIFY_SIGNAL);
- fcntl(tdi->fd, F_NOTIFY,
- DN_CREATE|DN_DELETE|DN_MODIFY|DN_MULTISHOT);
+ if (tdi->fd == -1) {
+ printerr(0, "ERROR: failed to open %s\n", tdi->dirname);
+ free(tdi);
+ return -1;
}
+ fcntl(tdi->fd, F_SETSIG, DNOTIFY_SIGNAL);
+ fcntl(tdi->fd, F_NOTIFY, DN_CREATE|DN_DELETE|DN_MODIFY|DN_MULTISHOT);
TAILQ_INSERT_HEAD(&topdirs_list, tdi, list);
return 0;
--
1.7.9.5
next prev parent reply other threads:[~2012-07-31 21:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-27 21:02 [PATCH] rpc.gssd: don't call poll() twice a second J. Bruce Fields
2012-07-27 23:08 ` Jim Rees
2012-07-29 17:48 ` J. Bruce Fields
2012-07-29 23:09 ` Steve Dickson
2012-07-30 20:59 ` J. Bruce Fields
2012-07-30 22:10 ` J. Bruce Fields
2012-07-31 16:50 ` Steve Dickson
2012-07-31 20:59 ` J. Bruce Fields
2012-07-31 21:00 ` [PATCH 1/4] rpc.gssd: simplify signal handling J. Bruce Fields
2012-08-06 14:22 ` Steve Dickson
2012-07-31 21:00 ` [PATCH 2/4] rpc.gssd: don't call printerr from signal handler J. Bruce Fields
2012-07-31 21:22 ` Chuck Lever
2012-08-06 14:22 ` Steve Dickson
2012-07-31 21:00 ` J. Bruce Fields [this message]
2012-08-06 14:23 ` [PATCH 3/4] rpc.gssd: handle error to open toplevel directory Steve Dickson
2012-07-31 21:00 ` [PATCH 4/4] rpc.gssd: don't call poll() twice a second J. Bruce Fields
2012-07-31 21:23 ` Chuck Lever
2012-07-31 21:27 ` J. Bruce Fields
2012-07-31 22:29 ` Chuck Lever
2012-08-01 12:35 ` Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343768449-32205-3-git-send-email-bfields@redhat.com \
--to=bfields@redhat.com \
--cc=SteveD@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=rees@umich.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).