aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse/dir.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-02-07 03:15:26 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:26 -0500
commite231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f (patch)
treed4b17ef65960594681397a3acac02c2d248200b5 /fs/fuse/dir.c
parentd1bc8e95445224276d7896b8b08cbb0b28a0ca80 (diff)
Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using: perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security` Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/fuse/dir.c')
-rw-r--r--fs/fuse/dir.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index f56f91bd38be..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);
@@ -1006,7 +1006,7 @@ static char *read_link(struct dentry *dentry)
1006 char *link; 1006 char *link;
1007 1007
1008 if (IS_ERR(req)) 1008 if (IS_ERR(req))
1009 return ERR_PTR(PTR_ERR(req)); 1009 return ERR_CAST(req);
1010 1010
1011 link = (char *) __get_free_page(GFP_KERNEL); 1011 link = (char *) __get_free_page(GFP_KERNEL);
1012 if (!link) { 1012 if (!link) {