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/gfs2 | |
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/gfs2')
-rw-r--r-- | fs/gfs2/dir.c | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_export.c | 2 | ||||
-rw-r--r-- | fs/gfs2/ops_inode.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c index 57e2ed932adc..c34709512b19 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c | |||
@@ -1498,7 +1498,7 @@ struct inode *gfs2_dir_search(struct inode *dir, const struct qstr *name) | |||
1498 | dent = gfs2_dirent_search(dir, name, gfs2_dirent_find, &bh); | 1498 | dent = gfs2_dirent_search(dir, name, gfs2_dirent_find, &bh); |
1499 | if (dent) { | 1499 | if (dent) { |
1500 | if (IS_ERR(dent)) | 1500 | if (IS_ERR(dent)) |
1501 | return ERR_PTR(PTR_ERR(dent)); | 1501 | return ERR_CAST(dent); |
1502 | inode = gfs2_inode_lookup(dir->i_sb, | 1502 | inode = gfs2_inode_lookup(dir->i_sb, |
1503 | be16_to_cpu(dent->de_type), | 1503 | be16_to_cpu(dent->de_type), |
1504 | be64_to_cpu(dent->de_inum.no_addr), | 1504 | be64_to_cpu(dent->de_inum.no_addr), |
diff --git a/fs/gfs2/ops_export.c b/fs/gfs2/ops_export.c index b9da62348a87..334c7f85351b 100644 --- a/fs/gfs2/ops_export.c +++ b/fs/gfs2/ops_export.c | |||
@@ -143,7 +143,7 @@ static struct dentry *gfs2_get_parent(struct dentry *child) | |||
143 | * have to return that as a(n invalid) pointer to dentry. | 143 | * have to return that as a(n invalid) pointer to dentry. |
144 | */ | 144 | */ |
145 | if (IS_ERR(inode)) | 145 | if (IS_ERR(inode)) |
146 | return ERR_PTR(PTR_ERR(inode)); | 146 | return ERR_CAST(inode); |
147 | 147 | ||
148 | dentry = d_alloc_anon(inode); | 148 | dentry = d_alloc_anon(inode); |
149 | if (!dentry) { | 149 | if (!dentry) { |
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c index 9f71372c1757..e87412902bed 100644 --- a/fs/gfs2/ops_inode.c +++ b/fs/gfs2/ops_inode.c | |||
@@ -111,7 +111,7 @@ static struct dentry *gfs2_lookup(struct inode *dir, struct dentry *dentry, | |||
111 | 111 | ||
112 | inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd); | 112 | inode = gfs2_lookupi(dir, &dentry->d_name, 0, nd); |
113 | if (inode && IS_ERR(inode)) | 113 | if (inode && IS_ERR(inode)) |
114 | return ERR_PTR(PTR_ERR(inode)); | 114 | return ERR_CAST(inode); |
115 | 115 | ||
116 | if (inode) { | 116 | if (inode) { |
117 | struct gfs2_glock *gl = GFS2_I(inode)->i_gl; | 117 | struct gfs2_glock *gl = GFS2_I(inode)->i_gl; |