From 618cd671cdc8039581606b625b1ea8d73d6fb701 Mon Sep 17 00:00:00 2001 From: johann Date: Tue, 7 Oct 2008 09:54:50 +0000 Subject: [PATCH] Branch b1_8_gate b=17115 i=deen i=andrew check for IS_ERR(dentry) in the cleanup path of mds_reint_rename(). --- lustre/mds/mds_reint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c index 05a0269..256d8cc 100644 --- a/lustre/mds/mds_reint.c +++ b/lustre/mds/mds_reint.c @@ -2596,9 +2596,9 @@ no_unlink: GOTO(cleanup, rc); cleanup: - inodes[0] = de_srcdir ? de_srcdir->d_inode : NULL; + inodes[0] = de_srcdir && !IS_ERR(de_srcdir) ? de_srcdir->d_inode : NULL; inodes[1] = old_inode; - inodes[2] = de_tgtdir ? de_tgtdir->d_inode : NULL; + inodes[2] = de_tgtdir && !IS_ERR(de_tgtdir) ? de_tgtdir->d_inode : NULL; inodes[3] = new_inode; rc = mds_finish_transno(mds, inodes, handle, req, rc, 0, 0); -- 1.8.3.1