| From ed0e3ace576d297a5c7015401db1060bbf677b94 Mon Sep 17 00:00:00 2001 |
| From: Jeff Layton <jlayton@redhat.com> |
| Date: Tue, 1 Jun 2010 16:21:01 -0400 |
| Subject: cifs: don't attempt busy-file rename unless it's in same directory |
| |
| From: Jeff Layton <jlayton@redhat.com> |
| |
| commit ed0e3ace576d297a5c7015401db1060bbf677b94 upstream. |
| |
| Busy-file renames don't actually work across directories, so we need |
| to limit this code to renames within the same dir. |
| |
| This fixes the bug detailed here: |
| |
| https://bugzilla.redhat.com/show_bug.cgi?id=591938 |
| |
| Signed-off-by: Jeff Layton <jlayton@redhat.com> |
| Signed-off-by: Steve French <sfrench@us.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| fs/cifs/inode.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/fs/cifs/inode.c |
| +++ b/fs/cifs/inode.c |
| @@ -1284,6 +1284,10 @@ cifs_do_rename(int xid, struct dentry *f |
| if (rc == 0 || rc != -ETXTBSY) |
| return rc; |
| |
| + /* open-file renames don't work across directories */ |
| + if (to_dentry->d_parent != from_dentry->d_parent) |
| + return rc; |
| + |
| /* open the file to be renamed -- we need DELETE perms */ |
| rc = CIFSSMBOpen(xid, pTcon, fromPath, FILE_OPEN, DELETE, |
| CREATE_NOT_DIR, &srcfid, &oplock, NULL, |
