Attachment 302448 Details for Bug 437921 – upstream patch

[patch] upstream patch

0018-BZ-437291-knfsd-fix-setattr-on-symlink-error-retur.patch (text/plain), 1.53 KB, created by Jeff Layton on 2008-04-15 13:10:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-04-15 13:10:42 UTC

Size: 1.53 KB

patch

obsolete

>From 36f78f4584eef3b05e8637a06de91733243195a8 Mon Sep 17 00:00:00 2001
>From: NeilBrown <neilb@cse.unsw.edu.au>
>Date: Mon, 7 Nov 2005 01:00:23 -0800
>Subject: [PATCH] BZ#437291: knfsd: fix setattr-on-symlink error return
>
>This is a somewhat cosmetic fix to keep the SpecFS validation test from
>complaining.
>
>SpecFS want's to try chmod on symlinks, and ext3 and reiser (at least) return
>ENOTSUPP.
>
>Probably both sides are being silly, but it is easiest to simply make it a
>non-issue and filter out chmod requests on symlinks at the nfsd level.
>
>Signed-off-by: Olaf Kirch <okir@suse.de>
>Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
>Signed-off-by: Neil Brown <neilb@suse.de>
>Signed-off-by: Andrew Morton <akpm@osdl.org>
>Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>---
> fs/nfsd/vfs.c |    9 ++++++++-
> 1 files changed, 8 insertions(+), 1 deletions(-)
>
>diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
>index 93c0cda..f3fe11c 100644
>--- a/fs/nfsd/vfs.c
>+++ b/fs/nfsd/vfs.c
>@@ -255,12 +255,19 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
> 
> 	/* Get inode */
> 	err = fh_verify(rqstp, fhp, ftype, accmode);
>-	if (err || !iap->ia_valid)
>+	if (err)
> 		goto out;
> 
> 	dentry = fhp->fh_dentry;
> 	inode = dentry->d_inode;
> 
>+	/* Ignore any mode updates on symlinks */
>+	if (S_ISLNK(inode->i_mode))
>+		iap->ia_valid &= ~ATTR_MODE;
>+
>+	if (!iap->ia_valid)
>+		goto out;
>+
> 	/* NFSv2 does not differentiate between "set-[ac]time-to-now"
> 	 * which only requires access, and "set-[ac]time-to-X" which
> 	 * requires ownership.
>-- 
>1.5.3.6
>

Actions: View | Diff

Attachments on bug 437921: 298339 | 298763 | 302448