hppfs: check for IS_ERR() instead of != NULL
Subsystems (2)
PATCH 10/14 hppfs: check for IS_ERR() instead of != NULL
From: Vasiliy Kulikov <[email protected]>
Function get_inode may return ERR_PTR(...). Check for it.
---
Compile tested.
fs/hppfs/hppfs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/hppfs/hppfs.c +2 -2
@@ -173,7 +173,7 @@ static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, err = -ENOMEM ; inode =get_inode (ino->i_sb, proc_dentry); -if (!inode) +if (IS_ERR_OR_NULL (inode)) goto out_dput;d_add (dentry, inode);
@@ -730,7 +730,7 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent) err = -ENOMEM ; root_inode =get_inode (sb, proc_mnt->mnt_sb->s_root); -if (!root_inode) +if (IS_ERR_OR_NULL (root_inode)) goto out_mntput; sb->s_root =d_alloc_root (root_inode);
Signature · 1 line
1.7.0.4
Quoted 25 lines · On Sun, 5 Sep 2010 22:32:56 +0400 Kulikov Vasiliy <[email protected]> wrote:
From: Vasiliy Kulikov <[email protected]>
Function
get_inodemay returnERR_PTR(...). Check for it.Signed-off-by Vasiliy Kulikov <[email protected]>---
Compile tested.fs/hppfs/hppfs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)fs/hppfs/hppfs.c +1
-1@@ -173,7 +173,7 @@ static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, err = -ENOMEM ; inode =get_inode (ino->i_sb, proc_dentry); -if (!inode) +if (IS_ERR_OR_NULL (inode)) goto out_dput;d_add (dentry, inode);
fs/hppfs/hppfs.c static int hppfs_fill_super(struct super_block *sb, void *d, int silent) · line 736
Quoted 8 lines
fs/hppfs/hppfs.c +1
-1@@ -730,7 +730,7 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent) err = -ENOMEM ; root_inode =get_inode (sb, proc_mnt->mnt_sb->s_root); -if (!root_inode) +if (IS_ERR_OR_NULL (root_inode)) goto out_mntput; sb->s_root =d_alloc_root (root_inode);
This fix is rather half-and-half.
If we're going to *assume* that an IS_ERR_OR_NULL return from get_inode() means ENOMEM then there was no point in returning an errno from get_inode()! So we can just do this:
fs/hppfs/hppfs.c renamed from fs/hppfs/hppfs.c~a +1 -1
@@ -683,7 +683,7 @@ static struct inode *get_inode(struct sustruct inode *inode =new_inode (sb);if (!inode) -return ERR_PTR (-ENOMEM ); +return NULL ;if (S_ISDIR (dentry->d_inode->i_mode)) { inode->i_op = &hppfs_dir_iops;
_
If, however, we want to be able to return other error codes from get_inode() (which is generally a good idea) then we should change the callers of get_inode() to use PTR_ERR() and to propagate the error code upwards.