Attachment 2194 Details for Bug 4182 – fix to report errors on retry of rename request

fix to report errors on retry of rename request

rename-error-reporting.patch (text/plain), 1.27 KB, created by Steve French on 2006-11-01 21:36:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve French

Created: 2006-11-01 21:36:17 UTC

Size: 1.27 KB

patch

obsolete

>diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
>index 35d54bb..dffe295 100644
>--- a/fs/cifs/inode.c
>+++ b/fs/cifs/inode.c
>@@ -885,10 +885,14 @@ int cifs_rename(struct inode *source_ino
> 			kmalloc(2 * sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL);
> 		if (info_buf_source != NULL) {
> 			info_buf_target = info_buf_source + 1;
>-			rc = CIFSSMBUnixQPathInfo(xid, pTcon, fromName,
>-				info_buf_source, cifs_sb_source->local_nls, 
>-				cifs_sb_source->mnt_cifs_flags &
>-					CIFS_MOUNT_MAP_SPECIAL_CHR);
>+			if (pTcon->ses->capabilities & CAP_UNIX)
>+				rc = CIFSSMBUnixQPathInfo(xid, pTcon, fromName,
>+					info_buf_source, 
>+					cifs_sb_source->local_nls,
>+					cifs_sb_source->mnt_cifs_flags &
>+						CIFS_MOUNT_MAP_SPECIAL_CHR);
>+			/* else rc is still EEXIST so will fall through to
>+			   unlink the target and retry rename */
> 			if (rc == 0) {
> 				rc = CIFSSMBUnixQPathInfo(xid, pTcon, toName,
> 						info_buf_target,
>@@ -937,7 +941,7 @@ int cifs_rename(struct inode *source_ino
> 				 cifs_sb_source->mnt_cifs_flags & 
> 					CIFS_MOUNT_MAP_SPECIAL_CHR);
> 		if (rc==0) {
>-			CIFSSMBRenameOpenFile(xid, pTcon, netfid, toName,
>+			rc = CIFSSMBRenameOpenFile(xid, pTcon, netfid, toName,
> 					      cifs_sb_source->local_nls, 
> 					      cifs_sb_source->mnt_cifs_flags &
> 						CIFS_MOUNT_MAP_SPECIAL_CHR);

Actions: View

Attachments on bug 4182: 2194