Attachment 575818 Details for Bug 808112 – proposed patch

[patch] proposed patch

nfsd-symlink.patch (text/plain), 1.36 KB, created by Orion Poplawski on 2012-04-06 19:27:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Orion Poplawski

Created: 2012-04-06 19:27:22 UTC

Size: 1.36 KB

patch

obsolete

>diff -up linux-2.6.32-220.7.1.el6.i686/fs/nfsd/nfs4proc.c.orig linux-2.6.32-220.7.1.el6.i686/fs/nfsd/nfs4proc.c
>--- linux-2.6.32-220.7.1.el6.i686/fs/nfsd/nfs4proc.c.orig	2012-02-10 12:43:03.000000000 -0700
>+++ linux-2.6.32-220.7.1.el6.i686/fs/nfsd/nfs4proc.c	2012-04-05 11:10:27.079773136 -0600
>@@ -233,12 +233,12 @@ do_open_lookup(struct svc_rqst *rqstp, s
> 		status = nfsd_lookup(rqstp, current_fh,
> 				     open->op_fname.data, open->op_fname.len, &resfh);
> 		fh_unlock(current_fh);
>-		if (status)
>-			goto out;
>-		status = nfsd_check_obj_isreg(&resfh);
> 	}
> 	if (status)
> 		goto out;
>+	status = nfsd_check_obj_isreg(&resfh);
>+	if (status)
>+		goto out;
> 
> 	if (is_create_with_attrs(open) && open->op_acl != NULL)
> 		do_set_nfs4_acl(rqstp, &resfh, open->op_acl, open->op_bmval);
>diff -up linux-2.6.32-220.7.1.el6.i686/fs/nfsd/vfs.c.orig linux-2.6.32-220.7.1.el6.i686/fs/nfsd/vfs.c
>--- linux-2.6.32-220.7.1.el6.i686/fs/nfsd/vfs.c.orig	2012-02-10 12:42:57.000000000 -0700
>+++ linux-2.6.32-220.7.1.el6.i686/fs/nfsd/vfs.c	2012-04-05 11:08:10.214739322 -0600
>@@ -1448,7 +1448,7 @@ nfsd_create_v3(struct svc_rqst *rqstp, s
> 		switch (createmode) {
> 		case NFS3_CREATE_UNCHECKED:
> 			if (! S_ISREG(dchild->d_inode->i_mode))
>-				err = nfserr_exist;
>+				goto out;
> 			else if (truncp) {
> 				/* in nfsv4, we need to treat this case a little
> 				 * differently.  we don't want to truncate the

Actions: View | Diff

Attachments on bug 808112: 573712 | 575818