X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=fs%2Ffuse%2Fdir.c;h=7fb514b6d85294cfb76fe3fc94c681b6292834c4;hb=f3aafa6c2535d36542a6dfc8647cd2fdb5999648;hp=f56f91bd38bea8b978bb26c38d8e3e3bb993e00a;hpb=d870ec7281d8429ab17d2e0324f4d8ca3f3de62d;p=linux-2.6-omap-h63xx.git diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index f56f91bd38b..7fb514b6d85 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); @@ -1006,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) {