Attachment 621082 Details for Bug 851312 – Patch the fixes the problem

[patch] Patch the fixes the problem

bz851312.diff (text/plain), 1.51 KB, created by Steve Dickson on 2012-10-03 19:12:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2012-10-03 19:12:28 UTC

Size: 1.51 KB

patch

obsolete

>diff -up linux-2.6.32-315.el6.diocommit08_01.x86_64/fs/nfs/nfs4filelayoutdev.c.orig linux-2.6.32-315.el6.diocommit08_01.x86_64/fs/nfs/nfs4filelayoutdev.c
>--- linux-2.6.32-315.el6.diocommit08_01.x86_64/fs/nfs/nfs4filelayoutdev.c.orig	2012-10-02 13:33:27.000000000 -0400
>+++ linux-2.6.32-315.el6.diocommit08_01.x86_64/fs/nfs/nfs4filelayoutdev.c	2012-10-03 15:03:05.000000000 -0400
>@@ -236,12 +236,6 @@ decode_and_add_ds(struct xdr_stream *str
> 	if (unlikely(!p))
> 		goto out_err;
> 
>-	/* Check that netid is "tcp" */
>-	if (nlen != 3 ||  memcmp((char *)p, "tcp", 3)) {
>-		dprintk("%s: ERROR: non ipv4 TCP r_netid\n", __func__);
>-		goto out_err;
>-	}
>-
> 	/* r_addr */
> 	p = xdr_inline_decode(streamp, 4);
> 	if (unlikely(!p))
>@@ -395,6 +389,7 @@ decode_device(struct inode *ino, struct 
> 	for (i = 0; i < dsaddr->ds_num; i++) {
> 		int j;
> 		u32 mp_count;
>+		bool has_ds = false;
> 
> 		p = xdr_inline_decode(&stream, 4);
> 		if (unlikely(!p))
>@@ -408,11 +403,12 @@ decode_device(struct inode *ino, struct 
> 				mp_count);
> 		}
> 		for (j = 0; j < mp_count; j++) {
>-			if (j == 0) {
>+			if (!has_ds) {
> 				dsaddr->ds_list[i] = decode_and_add_ds(&stream,
> 					ino, gfp_flags);
>-				if (dsaddr->ds_list[i] == NULL)
>-					goto out_err_free_deviceid;
>+				if (dsaddr->ds_list[i] != NULL) {
>+					has_ds = true;
>+				}
> 			} else {
> 				u32 len;
> 				/* skip extra multipath */
>@@ -438,6 +434,8 @@ decode_device(struct inode *ino, struct 
> 					goto out_err_free_deviceid;
> 			}
> 		}
>+		if (!has_ds)
>+			goto out_err_free_deviceid;
> 	}
> 
> 	__free_page(scratch);

Actions: View | Diff

Attachments on bug 851312: 606683 | 621082