aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
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/reiserfs
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/reiserfs')
-rw-r--r--fs/reiserfs/inode.c2
-rw-r--r--fs/reiserfs/xattr.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 195309857e63..57917932212e 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1536,7 +1536,7 @@ static struct dentry *reiserfs_get_dentry(struct super_block *sb,
1536 if (!inode) 1536 if (!inode)
1537 inode = ERR_PTR(-ESTALE); 1537 inode = ERR_PTR(-ESTALE);
1538 if (IS_ERR(inode)) 1538 if (IS_ERR(inode))
1539 return ERR_PTR(PTR_ERR(inode)); 1539 return ERR_CAST(inode);
1540 result = d_alloc_anon(inode); 1540 result = d_alloc_anon(inode);
1541 if (!result) { 1541 if (!result) {
1542 iput(inode); 1542 iput(inode);
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index a5bd23ce0e46..eba037b3338f 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -155,7 +155,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
155 155
156 xadir = open_xa_dir(inode, flags); 156 xadir = open_xa_dir(inode, flags);
157 if (IS_ERR(xadir)) { 157 if (IS_ERR(xadir)) {
158 return ERR_PTR(PTR_ERR(xadir)); 158 return ERR_CAST(xadir);
159 } else if (xadir && !xadir->d_inode) { 159 } else if (xadir && !xadir->d_inode) {
160 dput(xadir); 160 dput(xadir);
161 return ERR_PTR(-ENODATA); 161 return ERR_PTR(-ENODATA);
@@ -164,7 +164,7 @@ static struct dentry *get_xa_file_dentry(const struct inode *inode,
164 xafile = lookup_one_len(name, xadir, strlen(name)); 164 xafile = lookup_one_len(name, xadir, strlen(name));
165 if (IS_ERR(xafile)) { 165 if (IS_ERR(xafile)) {
166 dput(xadir); 166 dput(xadir);
167 return ERR_PTR(PTR_ERR(xafile)); 167 return ERR_CAST(xafile);
168 } 168 }
169 169
170 if (xafile->d_inode) { /* file exists */ 170 if (xafile->d_inode) { /* file exists */