Re: [PATCH 3/3] cifs: Return EBUSY instead of ETXTBSY in cifs_rename_pending_delete()

[Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

On Wed, 2013-03-06 at 07:39 -0500, Jeff Layton wrote:
> On Tue,  5 Mar 2013 19:25:57 +0000
> Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> 
> > Instead of remapping ETXTBSY errors to EBUSY in cifs_unlink, replace all
> > cases of ETXTBSY in cifs_rename_pending_delete() with EBUSY.
> > 
> > Signed-off-by: Sachin Prabhu <sprabhu-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > ---
> >  fs/cifs/inode.c | 6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> > 
> > diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
> > index fee2d40..0ab0328 100644
> > --- a/fs/cifs/inode.c
> > +++ b/fs/cifs/inode.c
> > @@ -1034,7 +1034,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
> >  				   cifs_sb->mnt_cifs_flags &
> >  					    CIFS_MOUNT_MAP_SPECIAL_CHR);
> >  	if (rc != 0) {
> > -		rc = -ETXTBSY;
> > +		rc = -EBUSY;
> >  		goto undo_setattr;
> >  	}
> >  
> > @@ -1053,7 +1053,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry,
> >  		if (rc == -ENOENT)
> >  			rc = 0;
> >  		else if (rc != 0) {
> > -			rc = -ETXTBSY;
> > +			rc = -EBUSY;
> >  			goto undo_rename;
> >  		}
> >  		cifsInode->delete_pending = true;
> > @@ -1167,8 +1167,6 @@ psx_del_no_retry:
> >  			if (rc == 0)
> >  				cifs_drop_nlink(inode);
> >  		}
> > -		if (rc == -ETXTBSY)
> > -			rc = -EBUSY;
> 
> 
> 
> This doesn't look quite right. If ->rename_pending_delete isn't set,
> then rc will still stay -ETXTBSY. I think this is a good cleanup, but
> we need to consider changing the mapping for
> NT_STATUS_SHARING_VIOLATION to -EBUSY as well, and fix all of the
> places that look for -ETXTBSY in the cifs code.

Hello Jeff, 

NT_STATUS_SHARING_VIOLATION for smb2 is already set to return -EBUSY in 
smb2_error_map_table.

I looked into changing NT_STATUS_SHARING_VIOLATION for smb1 to use
-EBUSY instead. A quick check shows that NT_STATUS_SHARING_VIOLATION is
the only error condition linked to ETXTBSY which in turn is only checked
for in cifs_unlink() and in cifs_do_rename(). 
I then checked all possible error messages returned for smb1 and checked
for EBUSY mapped to these error messages. None of those appear to be
mapped to EBUSY either.

So making this change should be easy. I'll post the new patch soon.

Sachin Prabhu