diff options
author | David Howells <dhowells@redhat.com> | 2008-02-07 09:15:26 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 17:42:26 +0100 |
commit | e231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f (patch) | |
tree | d4b17ef65960594681397a3acac02c2d248200b5 /fs/jffs2/write.c | |
parent | Add an ERR_CAST() function to complement ERR_PTR and co. (diff) | |
download | linux-e231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f.tar.xz linux-e231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f.zip |
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/jffs2/write.c')
-rw-r--r-- | fs/jffs2/write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index 147e2cbee9e4..1b88e6e734ef 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c @@ -177,7 +177,7 @@ struct jffs2_full_dnode *jffs2_write_dnode(struct jffs2_sb_info *c, struct jffs2 void *hold_err = fn->raw; /* Release the full_dnode which is now useless, and return */ jffs2_free_full_dnode(fn); - return ERR_PTR(PTR_ERR(hold_err)); + return ERR_CAST(hold_err); } fn->ofs = je32_to_cpu(ri->offset); fn->size = je32_to_cpu(ri->dsize); @@ -313,7 +313,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff void *hold_err = fd->raw; /* Release the full_dirent which is now useless, and return */ jffs2_free_full_dirent(fd); - return ERR_PTR(PTR_ERR(hold_err)); + return ERR_CAST(hold_err); } if (retried) { |