From 6b8a654b090f28ad44736f35af9a823cbf5ead35 Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 16 Aug 2002 16:48:00 +0000 Subject: [PATCH] Remove some grossness I previously put in the error handling path. It turns out inode can only ever be NULL and not IS_ERR(). --- lustre/llite/namei.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index db5d5df..fdae25f 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -154,9 +154,11 @@ static struct dentry *ll_lookup2(struct inode * dir, struct dentry *dentry, if (dentry->d_name.len > EXT2_NAME_LEN) RETURN(ERR_PTR(-ENAMETOOLONG)); - if (it->it_op == IT_RENAME2) + if (it->it_op == IT_RENAME2) { /* Set below to be the old dentry from the IT_RENAME intent */ inode = ((struct dentry *)(it->it_data))->d_inode; + LASSERT(inode); + } err = ll_lock(dir, dentry, it, &lockh); if (err < 0) @@ -181,6 +183,7 @@ static struct dentry *ll_lookup2(struct inode * dir, struct dentry *dentry, it->it_data = NULL; GOTO(neg_req, NULL); } + LASSERT(dentry->d_inode); it->it_data = dentry; } else if (it->it_op == IT_OPEN) { it->it_data = NULL; @@ -224,10 +227,11 @@ static struct dentry *ll_lookup2(struct inode * dir, struct dentry *dentry, inode = iget4(dir->i_sb, ino, ll_find_inode, &md); out_req: - if (!inode || IS_ERR(inode)) { + LASSERT(!IS_ERR(inode)); + if (!inode) { ptlrpc_free_req(request); ll_intent_release(dentry); - RETURN(inode ? (struct dentry *)inode : ERR_PTR(-ENOMEM)); + RETURN(ERR_PTR(-ENOMEM)); } EXIT; neg_req: -- 1.8.3.1