From: Boaz Harrosh <bharrosh@panasas.com>
To: andros@netapp.com
Cc: pnfs@linux-nfs.org, linux-nfs@vger.kernel.org
Subject: [PATCH] SQUASHME: pnfsd-exofs: Change layoutget return codes
Date: Wed, 10 Feb 2010 10:24:46 +0200 [thread overview]
Message-ID: <4B726D4E.1000601@panasas.com> (raw)
In-Reply-To: <1265737357-9405-1-git-send-email-andros@netapp.com>
Dependent on patch from Andy:
[PATCH 1/6] pnfsd: fix file system API layout_get error codes
Change codes to nfs4.1 codes
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
fs/exofs/export.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/exofs/export.c b/fs/exofs/export.c
index be3d54e..7a59614 100644
--- a/fs/exofs/export.c
+++ b/fs/exofs/export.c
@@ -95,13 +95,13 @@ static int exofs_layout_get(
/* skip opaque size, will be filled-in later */
start = exp_xdr_reserve_qwords(xdr, 1);
if (!start) {
- err = -E2BIG;
+ err = nfserr_toosmall;
goto err;
}
creds = kcalloc(el->s_numdevs, sizeof(*creds), GFP_KERNEL);
if (!creds) {
- err = -ENOMEM;
+ err = nfserr_layouttrylater;
goto err;
}
@@ -134,8 +134,10 @@ static int exofs_layout_get(
layout.olo_comps = creds;
err = pnfs_osd_xdr_encode_layout(xdr, &layout);
- if (err)
+ if (err) {
+ err = nfserr_toosmall; /*FIXME: Change osd_xdr error codes */
goto err;
+ }
exp_xdr_encode_opaque_len(start, xdr->p);
@@ -146,7 +148,7 @@ static int exofs_layout_get(
spin_unlock(&oi->i_layout_lock);
if (in_recall)
- err = -EAGAIN;
+ err = nfserr_layouttrylater;
err:
kfree(creds);
--
1.6.6
next prev parent reply other threads:[~2010-02-10 8:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 17:42 [PATCH 0/6] pnfs DLM cluster only use read iomode layouts Version 2 andros
2010-02-09 17:42 ` [PATCH 1/6] pnfsd: fix file system API layout_get error codes andros
2010-02-09 17:42 ` [PATCH 2/6] pnfsd: fix NFS4ERR_BADIOMODE in layoutget andros
2010-02-09 17:42 ` [PATCH 3/6] pnfsd: DLM file layout only support read iomode layouts andros
2010-02-09 17:42 ` [PATCH 4/6] pnfsd: fix DLM file layout no device return andros
2010-02-09 17:42 ` [PATCH 5/6] pnfs: set failed layout bit per iomode andros
2010-02-09 17:42 ` [PATCH 6/6] pnfsd: fix compile errors when CONFIG_PNFSD is not set andros
2010-02-09 18:00 ` [pnfs] " Benny Halevy
2010-02-09 19:29 ` Andy Adamson
2010-02-09 18:03 ` [pnfs] [PATCH 2/6] pnfsd: fix NFS4ERR_BADIOMODE in layoutget Benny Halevy
2010-02-09 18:57 ` Andy Adamson
2010-02-10 8:26 ` Boaz Harrosh
2010-02-10 8:24 ` Boaz Harrosh [this message]
2010-02-10 10:45 ` [pnfs] [PATCH] SQUASHME: pnfsd-exofs: Change layoutget return codes Boaz Harrosh
2010-02-10 13:06 ` Halevy, Benny
[not found] ` <7225594ED4A1304C9E43D030A886D221F4C8EC-QcknvLX4j1suWLk7KE+CsC1byIy0dIec@public.gmane.org>
2010-02-10 13:43 ` Boaz Harrosh
2010-02-11 16:38 ` J. Bruce Fields
2010-02-11 17:34 ` Benny Halevy
2010-02-10 10:47 ` [PATCH version2] " Boaz Harrosh
2010-02-11 10:53 ` Benny Halevy
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=4B726D4E.1000601@panasas.com \
--to=bharrosh@panasas.com \
--cc=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=pnfs@linux-nfs.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