summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-06-01 16:21:01 -0400
committerSteve French <sfrench@us.ibm.com>2010-06-12 01:45:36 +0000
commited0e3ace576d297a5c7015401db1060bbf677b94 (patch)
tree0e5f0bee1be98a6c8c5c75fbf62c02c438e57df8 /fs
parent6c5de280b6683d194ee60cf22dee56eef0b09619 (diff)
downloadop-kernel-dev-ed0e3ace576d297a5c7015401db1060bbf677b94.zip
op-kernel-dev-ed0e3ace576d297a5c7015401db1060bbf677b94.tar.gz
cifs: don't attempt busy-file rename unless it's in same directory
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> CC: Stable <stable@kernel.org> Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 62b324f..6f0683c 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -1401,6 +1401,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,
OpenPOWER on IntegriCloud