mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-06 09:56:25 -04:00
staging: lustre: llite: no need to check dentry is NULL
We are already touching dentry in CDEBUG macros so it will crash long before these checks. Since this is the case no need to do an additional check. Signed-off-by: John L. Hammond <john.hammond@intel.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675 Reviewed-on: http://review.whamcloud.com/10769 Reviewed-by: Yang Sheng <yang.sheng@intel.com> Reviewed-by: Lai Siyao <lai.siyao@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
9329b69734
commit
5d9d0cb76c
@@ -987,7 +987,7 @@ static int ll_unlink(struct inode *dir, struct dentry *dchild)
|
||||
if (IS_ERR(op_data))
|
||||
return PTR_ERR(op_data);
|
||||
|
||||
if (dchild && dchild->d_inode)
|
||||
if (dchild->d_inode)
|
||||
op_data->op_fid3 = *ll_inode2fid(dchild->d_inode);
|
||||
|
||||
op_data->op_fid2 = op_data->op_fid3;
|
||||
@@ -1039,7 +1039,7 @@ static int ll_rmdir(struct inode *dir, struct dentry *dchild)
|
||||
if (IS_ERR(op_data))
|
||||
return PTR_ERR(op_data);
|
||||
|
||||
if (dchild && dchild->d_inode)
|
||||
if (dchild->d_inode)
|
||||
op_data->op_fid3 = *ll_inode2fid(dchild->d_inode);
|
||||
|
||||
op_data->op_fid2 = op_data->op_fid3;
|
||||
@@ -1120,9 +1120,9 @@ static int ll_rename(struct inode *src, struct dentry *src_dchild,
|
||||
if (IS_ERR(op_data))
|
||||
return PTR_ERR(op_data);
|
||||
|
||||
if (src_dchild && src_dchild->d_inode)
|
||||
if (src_dchild->d_inode)
|
||||
op_data->op_fid3 = *ll_inode2fid(src_dchild->d_inode);
|
||||
if (tgt_dchild && tgt_dchild->d_inode)
|
||||
if (tgt_dchild->d_inode)
|
||||
op_data->op_fid4 = *ll_inode2fid(tgt_dchild->d_inode);
|
||||
|
||||
err = md_rename(sbi->ll_md_exp, op_data,
|
||||
|
||||
Reference in New Issue
Block a user