[PATCH] nfsd_symlink() failpath fix

[PATCH] nfsd_symlink() failpath fix

[Andreas Gruenbacher]

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

Hello,

In both 2.5 and 2.4, the fs/nfsd/vfs.c:nfsd_symlink() function calls down to 
notify_change(). If notify_change fails for some reason, the error code is 
not converted to an nfs no-the-wire error code as is should. The attached 
patches fix that (one for 2.4, the other for 2.5).

Marcelo, could you please apply the patch?
Andrew, could you please batch that up in your next update for Linus?


Thanks,
Andreas.

------------------------------------------------------------------
 Andreas Gruenbacher                                SuSE Linux AG
 mailto:agruen@suse.de                     Deutschherrnstr. 15-19
 http://www.suse.de/                   D-90429 Nuernberg, Germany

[-- Attachment #2: nfsd-symlink-failpath-2.5.64.diff --]
[-- Type: text/x-diff, Size: 446 bytes --]

--- linux-2.5.64.orig/fs/nfsd/vfs.c	2003-03-17 11:36:39.000000000 +0100
+++ linux-2.5.64/fs/nfsd/vfs.c	2003-03-17 11:37:32.000000000 +0100
@@ -1190,7 +1190,9 @@
 				iap->ia_mode = (iap->ia_mode&S_IALLUGO)
 					| S_IFLNK;
 				err = notify_change(dnew, iap);
-				if (!err && EX_ISSYNC(fhp->fh_export))
+				if (err)
+					err = nfserrno(err);
+				else if (EX_ISSYNC(fhp->fh_export))
 					write_inode_now(dentry->d_inode, 1);
 		       }
 		}

[-- Attachment #3: nfsd-symlink-failpath-2.4.21-pre5.diff --]
[-- Type: text/x-diff, Size: 456 bytes --]

--- linux-2.4.21-pre5.orig/fs/nfsd/vfs.c	2003-03-17 11:49:27.000000000 +0100
+++ linux-2.4.21-pre5/fs/nfsd/vfs.c	2003-03-17 11:50:01.000000000 +0100
@@ -1151,7 +1151,9 @@
 				iap->ia_mode = (iap->ia_mode&S_IALLUGO)
 					| S_IFLNK;
 				err = notify_change(dnew, iap);
-				if (!err && EX_ISSYNC(fhp->fh_export))
+				if (err)
+					err = nfserrno(err);
+				else if (EX_ISSYNC(fhp->fh_export))
 					write_inode_now(dentry->d_inode, 1);
 		       }
 		}

[PATCH] nfsd_symlink() failpath fix

[Andreas Gruenbacher]

[-- Attachment #1: Type: text/plain, Size: 686 bytes --]

Hello,

In both 2.5 and 2.4, the fs/nfsd/vfs.c:nfsd_symlink() function calls down to 
notify_change(). If notify_change fails for some reason, the error code is 
not converted to an nfs no-the-wire error code as is should. The attached 
patches fix that (one for 2.4, the other for 2.5).

Marcelo, could you please apply the patch?
Andrew, could you please batch that up in your next update for Linus?


Thanks,
Andreas.

------------------------------------------------------------------
 Andreas Gruenbacher                                SuSE Linux AG
 mailto:agruen@suse.de                     Deutschherrnstr. 15-19
 http://www.suse.de/                   D-90429 Nuernberg, Germany

[-- Attachment #2: nfsd-symlink-failpath-2.5.64.diff --]
[-- Type: text/x-diff, Size: 446 bytes --]

--- linux-2.5.64.orig/fs/nfsd/vfs.c	2003-03-17 11:36:39.000000000 +0100
+++ linux-2.5.64/fs/nfsd/vfs.c	2003-03-17 11:37:32.000000000 +0100
@@ -1190,7 +1190,9 @@
 				iap->ia_mode = (iap->ia_mode&S_IALLUGO)
 					| S_IFLNK;
 				err = notify_change(dnew, iap);
-				if (!err && EX_ISSYNC(fhp->fh_export))
+				if (err)
+					err = nfserrno(err);
+				else if (EX_ISSYNC(fhp->fh_export))
 					write_inode_now(dentry->d_inode, 1);
 		       }
 		}

[-- Attachment #3: nfsd-symlink-failpath-2.4.21-pre5.diff --]
[-- Type: text/x-diff, Size: 456 bytes --]

--- linux-2.4.21-pre5.orig/fs/nfsd/vfs.c	2003-03-17 11:49:27.000000000 +0100
+++ linux-2.4.21-pre5/fs/nfsd/vfs.c	2003-03-17 11:50:01.000000000 +0100
@@ -1151,7 +1151,9 @@
 				iap->ia_mode = (iap->ia_mode&S_IALLUGO)
 					| S_IFLNK;
 				err = notify_change(dnew, iap);
-				if (!err && EX_ISSYNC(fhp->fh_export))
+				if (err)
+					err = nfserrno(err);
+				else if (EX_ISSYNC(fhp->fh_export))
 					write_inode_now(dentry->d_inode, 1);
 		       }
 		}