staging: lustre: llite: Remove IS_ERR tests
ll_iget() has been modified to always return NULL in case of error and not a ERR_PTR. Consequently, remove unnecessary IS_ERR tests as now ll_iget() function can never return a ERR_PTR. Additionally, reinitialising root and inode to NULL has been removed since they have already been tested for the same. Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
b1752e864f
Коммит
020ecc6f32
|
@ -496,7 +496,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
|
|||
md_free_lustre_md(sbi->ll_md_exp, &lmd);
|
||||
ptlrpc_req_finished(request);
|
||||
|
||||
if (IS_ERR_OR_NULL(root)) {
|
||||
if (!(root)) {
|
||||
if (lmd.lsm)
|
||||
obd_free_memmd(sbi->ll_dt_exp, &lmd.lsm);
|
||||
#ifdef CONFIG_FS_POSIX_ACL
|
||||
|
@ -505,8 +505,7 @@ static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
|
|||
lmd.posix_acl = NULL;
|
||||
}
|
||||
#endif
|
||||
err = IS_ERR(root) ? PTR_ERR(root) : -EBADF;
|
||||
root = NULL;
|
||||
err = -EBADF;
|
||||
CERROR("lustre_lite: bad iget4 for root\n");
|
||||
goto out_root;
|
||||
}
|
||||
|
@ -1983,15 +1982,14 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
|
|||
*inode = ll_iget(sb, cl_fid_build_ino(&md.body->fid1,
|
||||
sbi->ll_flags & LL_SBI_32BIT_API),
|
||||
&md);
|
||||
if (IS_ERR_OR_NULL(*inode)) {
|
||||
if (!inode) {
|
||||
#ifdef CONFIG_FS_POSIX_ACL
|
||||
if (md.posix_acl) {
|
||||
posix_acl_release(md.posix_acl);
|
||||
md.posix_acl = NULL;
|
||||
}
|
||||
#endif
|
||||
rc = IS_ERR(*inode) ? PTR_ERR(*inode) : -ENOMEM;
|
||||
*inode = NULL;
|
||||
rc = -ENOMEM;
|
||||
CERROR("new_inode -fatal: rc %d\n", rc);
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -127,7 +127,7 @@ struct inode *ll_iget(struct super_block *sb, ino_t hash,
|
|||
}
|
||||
if (rc != 0) {
|
||||
iget_failed(inode);
|
||||
inode = ERR_PTR(rc);
|
||||
inode = NULL;
|
||||
} else
|
||||
unlock_new_inode(inode);
|
||||
} else if (!(inode->i_state & (I_FREEING | I_CLEAR)))
|
||||
|
|
Загрузка…
Ссылка в новой задаче