diff mbox

[U-Boot] NFS: Add error message when U-Boot NFS version (V2) is not supported by NFS server

Message ID 1465218705-1123-1-git-send-email-guillaume.gardet@free.fr
State Accepted
Commit 69fd0d4
Delegated to: Joe Hershberger
Headers show

Commit Message

Guillaume GARDET June 6, 2016, 1:11 p.m. UTC
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: joe.hershberger@ni.com

---
 net/nfs.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

Comments

Joe Hershberger June 7, 2016, 3:56 p.m. UTC | #1
On Mon, Jun 6, 2016 at 8:11 AM, Guillaume GARDET
<guillaume.gardet@free.fr> wrote:
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: joe.hershberger@ni.com

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Guillaume GARDET June 17, 2016, 12:27 p.m. UTC | #2
Le 07/06/2016 17:56, Joe Hershberger a écrit :
> On Mon, Jun 6, 2016 at 8:11 AM, Guillaume GARDET
> <guillaume.gardet@free.fr> wrote:
>> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
>> Cc: joe.hershberger@ni.com
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>

Joe, you will add it to u-boot-net repo and then send a pull request to Tom or Tom will directly pick it up?


Guillaume
Joe Hershberger June 17, 2016, 3:56 p.m. UTC | #3
On Fri, Jun 17, 2016 at 7:27 AM, Guillaume Gardet
<guillaume.gardet@free.fr> wrote:
>
>
> Le 07/06/2016 17:56, Joe Hershberger a écrit :
>>
>> On Mon, Jun 6, 2016 at 8:11 AM, Guillaume GARDET
>> <guillaume.gardet@free.fr> wrote:
>>>
>>> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
>>> Cc: joe.hershberger@ni.com
>>
>> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
>>
>
> Joe, you will add it to u-boot-net repo and then send a pull request to Tom
> or Tom will directly pick it up?

I'll take tare of it.

-Joe
Joe Hershberger June 17, 2016, 4:28 p.m. UTC | #4
Hi Guillaume,

On Mon, Jun 6, 2016 at 8:11 AM, Guillaume GARDET
<guillaume.gardet@free.fr> wrote:
> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
> Cc: joe.hershberger@ni.com
>
> ---
>  net/nfs.c | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/net/nfs.c b/net/nfs.c
> index 78968d8..0ed47c9 100644
> --- a/net/nfs.c
> +++ b/net/nfs.c
> @@ -481,8 +481,22 @@ static int nfs_lookup_reply(uchar *pkt, unsigned len)
>         if (rpc_pkt.u.reply.rstatus  ||
>             rpc_pkt.u.reply.verifier ||
>             rpc_pkt.u.reply.astatus  ||
> -           rpc_pkt.u.reply.data[0])
> +           rpc_pkt.u.reply.data[0]){
> +               switch(ntohl(rpc_pkt.u.reply.astatus)){

There are 7 checkpatch.pl issues with this patch. I'll fix them when I
apply it, but in the future, please at least run checkpatch and follow
the coding conventions. Even better would be to use tools/patman.

...

-Joe
Joe Hershberger June 21, 2016, 10:10 p.m. UTC | #5
Hi Guillaume,

https://patchwork.ozlabs.org/patch/630898/ was applied to u-boot-net.git.

Thanks!
-Joe
diff mbox

Patch

diff --git a/net/nfs.c b/net/nfs.c
index 78968d8..0ed47c9 100644
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -481,8 +481,22 @@  static int nfs_lookup_reply(uchar *pkt, unsigned len)
 	if (rpc_pkt.u.reply.rstatus  ||
 	    rpc_pkt.u.reply.verifier ||
 	    rpc_pkt.u.reply.astatus  ||
-	    rpc_pkt.u.reply.data[0])
+	    rpc_pkt.u.reply.data[0]){
+		switch(ntohl(rpc_pkt.u.reply.astatus)){
+		case 0: /* Not an error */
+			break;
+		case 2: /* Remote can't support NFS version */
+			printf("*** ERROR: NFS version not supported: Requested: V%d, accepted: min V%d - max V%d\n", 
+				2, 
+				ntohl(rpc_pkt.u.reply.data[0]), 
+				ntohl(rpc_pkt.u.reply.data[1]));
+			break;
+		default: /* Unknown error on 'accept state' flag */
+			printf("*** ERROR: accept state error (%d)\n", ntohl(rpc_pkt.u.reply.astatus));
+			break;
+		}
 		return -1;
+	}
 
 	memcpy(filefh, rpc_pkt.u.reply.data + 1, NFS_FHSIZE);