diff options
author | David Howells <dhowells@redhat.com> | 2008-02-07 03:15:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:26 -0500 |
commit | e231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f (patch) | |
tree | d4b17ef65960594681397a3acac02c2d248200b5 /fs/nfs | |
parent | d1bc8e95445224276d7896b8b08cbb0b28a0ca80 (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/nfs')
-rw-r--r-- | fs/nfs/getroot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index e6242cdbaf9..fae97196daa 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c | |||
@@ -96,7 +96,7 @@ struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh) | |||
96 | inode = nfs_fhget(sb, mntfh, fsinfo.fattr); | 96 | inode = nfs_fhget(sb, mntfh, fsinfo.fattr); |
97 | if (IS_ERR(inode)) { | 97 | if (IS_ERR(inode)) { |
98 | dprintk("nfs_get_root: get root inode failed\n"); | 98 | dprintk("nfs_get_root: get root inode failed\n"); |
99 | return ERR_PTR(PTR_ERR(inode)); | 99 | return ERR_CAST(inode); |
100 | } | 100 | } |
101 | 101 | ||
102 | error = nfs_superblock_set_dummy_root(sb, inode); | 102 | error = nfs_superblock_set_dummy_root(sb, inode); |
@@ -266,7 +266,7 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh) | |||
266 | inode = nfs_fhget(sb, mntfh, &fattr); | 266 | inode = nfs_fhget(sb, mntfh, &fattr); |
267 | if (IS_ERR(inode)) { | 267 | if (IS_ERR(inode)) { |
268 | dprintk("nfs_get_root: get root inode failed\n"); | 268 | dprintk("nfs_get_root: get root inode failed\n"); |
269 | return ERR_PTR(PTR_ERR(inode)); | 269 | return ERR_CAST(inode); |
270 | } | 270 | } |
271 | 271 | ||
272 | error = nfs_superblock_set_dummy_root(sb, inode); | 272 | error = nfs_superblock_set_dummy_root(sb, inode); |