Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 80d2f5292cf9..7fb514b6d852 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -269,12 +269,12 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
 
         req = fuse_get_req(fc);
         if (IS_ERR(req))
-                return ERR_PTR(PTR_ERR(req));
+                return ERR_CAST(req);
 
         forget_req = fuse_get_req(fc);
         if (IS_ERR(forget_req)) {
                 fuse_put_request(fc, req);
-                return ERR_PTR(PTR_ERR(forget_req));
+                return ERR_CAST(forget_req);
         }
 
         attr_version = fuse_get_attr_version(fc);
@@ -416,6 +416,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode,
         fuse_put_request(fc, forget_req);
         d_instantiate(entry, inode);
         fuse_change_entry_timeout(entry, &outentry);
+        fuse_invalidate_attr(dir);
         file = lookup_instantiate_filp(nd, entry, generic_file_open);
         if (IS_ERR(file)) {
                 ff->fh = outopen.fh;
@@ -1005,7 +1006,7 @@ static char *read_link(struct dentry *dentry)
         char *link;
 
         if (IS_ERR(req))
-                return ERR_PTR(PTR_ERR(req));
+                return ERR_CAST(req);
 
         link = (char *) __get_free_page(GFP_KERNEL);
         if (!link) {