From: Mi Jinlong <mijinlong@cn.fujitsu.com>
To: Steve Dickson <SteveD@redhat.com>
Cc: NFSv3 list <linux-nfs@vger.kernel.org>
Subject: [PATCH] mount: avoid po_destroy to modify errno what we really want
Date: Thu, 25 Nov 2010 18:07:57 +0800 [thread overview]
Message-ID: <4CEE357D.2030007@cn.fujitsu.com> (raw)
We should return the errno that was set before po_destroy,
rather than the errno that was set at po_destroy.
Because the po_destroy function don't affect the return value,
this patch just revert the saved errno after po_destroy.
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
---
utils/mount/stropts.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 50a1a2a..d554877 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -592,7 +592,7 @@ static int nfs_do_mount_v3v2(struct nfsmount_info *mi,
struct sockaddr *sap, socklen_t salen)
{
struct mount_options *options = po_dup(mi->options);
- int result = 0;
+ int result = 0, save = 0;
if (!options) {
errno = ENOMEM;
@@ -637,7 +637,9 @@ static int nfs_do_mount_v3v2(struct nfsmount_info *mi,
result = nfs_sys_mount(mi, options);
out_fail:
+ save = errno;
po_destroy(options);
+ errno = save;
return result;
}
@@ -673,7 +675,7 @@ static int nfs_do_mount_v4(struct nfsmount_info *mi,
struct sockaddr *sap, socklen_t salen)
{
struct mount_options *options = po_dup(mi->options);
- int result = 0;
+ int result = 0, save = 0;
if (!options) {
errno = ENOMEM;
@@ -724,7 +726,9 @@ static int nfs_do_mount_v4(struct nfsmount_info *mi,
result = nfs_sys_mount(mi, options);
out_fail:
+ save = errno;
po_destroy(options);
+ errno = save;
return result;
}
--
1.7.3.2
next reply other threads:[~2010-11-25 10:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-25 10:07 Mi Jinlong [this message]
2010-11-29 14:45 ` [PATCH] mount: avoid po_destroy to modify errno what we really want Chuck Lever
2010-11-29 15:20 ` Steve Dickson
2010-11-30 2:05 ` Bian Naimeng
2010-11-30 15:11 ` Chuck Lever
2010-12-01 1:01 ` Bian Naimeng
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=4CEE357D.2030007@cn.fujitsu.com \
--to=mijinlong@cn.fujitsu.com \
--cc=SteveD@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/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).