diff options
Diffstat (limited to 'fs/fuse/dir.c')
-rw-r--r-- | fs/fuse/dir.c | 7 |
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, | |||
269 | 269 | ||
270 | req = fuse_get_req(fc); | 270 | req = fuse_get_req(fc); |
271 | if (IS_ERR(req)) | 271 | if (IS_ERR(req)) |
272 | return ERR_PTR(PTR_ERR(req)); | 272 | return ERR_CAST(req); |
273 | 273 | ||
274 | forget_req = fuse_get_req(fc); | 274 | forget_req = fuse_get_req(fc); |
275 | if (IS_ERR(forget_req)) { | 275 | if (IS_ERR(forget_req)) { |
276 | fuse_put_request(fc, req); | 276 | fuse_put_request(fc, req); |
277 | return ERR_PTR(PTR_ERR(forget_req)); | 277 | return ERR_CAST(forget_req); |
278 | } | 278 | } |
279 | 279 | ||
280 | attr_version = fuse_get_attr_version(fc); | 280 | attr_version = fuse_get_attr_version(fc); |
@@ -416,6 +416,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, int mode, | |||
416 | fuse_put_request(fc, forget_req); | 416 | fuse_put_request(fc, forget_req); |
417 | d_instantiate(entry, inode); | 417 | d_instantiate(entry, inode); |
418 | fuse_change_entry_timeout(entry, &outentry); | 418 | fuse_change_entry_timeout(entry, &outentry); |
419 | fuse_invalidate_attr(dir); | ||
419 | file = lookup_instantiate_filp(nd, entry, generic_file_open); | 420 | file = lookup_instantiate_filp(nd, entry, generic_file_open); |
420 | if (IS_ERR(file)) { | 421 | if (IS_ERR(file)) { |
421 | ff->fh = outopen.fh; | 422 | ff->fh = outopen.fh; |
@@ -1005,7 +1006,7 @@ static char *read_link(struct dentry *dentry) | |||
1005 | char *link; | 1006 | char *link; |
1006 | 1007 | ||
1007 | if (IS_ERR(req)) | 1008 | if (IS_ERR(req)) |
1008 | return ERR_PTR(PTR_ERR(req)); | 1009 | return ERR_CAST(req); |
1009 | 1010 | ||
1010 | link = (char *) __get_free_page(GFP_KERNEL); | 1011 | link = (char *) __get_free_page(GFP_KERNEL); |
1011 | if (!link) { | 1012 | if (!link) { |