summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:23:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-05 13:23:29 -0800
commite5a92362226e1685988bbf8d7ed50ab23453acc0 (patch)
tree8d061fd85d8ace4c76f28851bc9a73b846cd79ac /fs
parent4397989fc91ed289909ecf307c2dc21cee0e7905 (diff)
parent5219f346b0ea2a2a8821f1e966b190788c285b0b (diff)
downloadlinux-3.10-e5a92362226e1685988bbf8d7ed50ab23453acc0.tar.gz
linux-3.10-e5a92362226e1685988bbf8d7ed50ab23453acc0.tar.bz2
linux-3.10-e5a92362226e1685988bbf8d7ed50ab23453acc0.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: invalidate target of rename fuse: fix kunmap in fuse_ioctl_copy_user fuse: prevent fuse_put_request on invalid pointer
Diffstat (limited to 'fs')
-rw-r--r--fs/fuse/dir.c4
-rw-r--r--fs/fuse/file.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 992f6c9410b..8ada78aade5 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -712,8 +712,10 @@ static int fuse_rename(struct inode *olddir, struct dentry *oldent,
fuse_invalidate_attr(newdir);
/* newent will end up negative */
- if (newent->d_inode)
+ if (newent->d_inode) {
+ fuse_invalidate_attr(newent->d_inode);
fuse_invalidate_entry_cache(newent);
+ }
} else if (err == -EINTR) {
/* If request was interrupted, DEITY only knows if the
rename actually took place. If the invalidation
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index a3492f7d207..c18913a777a 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1063,7 +1063,8 @@ ssize_t fuse_direct_io(struct file *file, const char __user *buf,
break;
}
}
- fuse_put_request(fc, req);
+ if (!IS_ERR(req))
+ fuse_put_request(fc, req);
if (res > 0)
*ppos = pos;
@@ -1599,7 +1600,7 @@ static int fuse_ioctl_copy_user(struct page **pages, struct iovec *iov,
kaddr += copy;
}
- kunmap(map);
+ kunmap(page);
}
return 0;