diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-06-01 16:21:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:29:24 -0700 |
| commit | 6fbe41cd712389ce66b48b04cf675d399c3762c6 (patch) | |
| tree | 4a83ba5b99c1c597b0fd95a404ebede282f7cd3c /fs | |
| parent | 9fcb9b3b8cf44cdfb2e6ac9b57252b960d7c22ac (diff) | |
cifs: don't attempt busy-file rename unless it's in same directory
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 29b9ea244c81..49b47c33dffb 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -1389,6 +1389,10 @@ cifs_do_rename(int xid, struct dentry *from_dentry, const char *fromPath, 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, |