From 1f87c9cd4d642bc03bc2df24a61a0fa0f3441a0c Mon Sep 17 00:00:00 2001 From: Eric Mei Date: Mon, 1 Nov 2010 10:15:02 -0600 Subject: [PATCH] b=24007 obj mode should be covered by MA_INODE. r=di.wang r=vitaly.fertman --- lustre/mdt/mdt_reint.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c index 3354f56..c142d53 100644 --- a/lustre/mdt/mdt_reint.c +++ b/lustre/mdt/mdt_reint.c @@ -761,22 +761,23 @@ static int mdt_reint_unlink(struct mdt_thread_info *info, if (rc == 0) mdt_handle_last_unlink(info, mc, ma); - switch (ma->ma_attr.la_mode & S_IFMT) { - case S_IFDIR: - mdt_counter_incr(req->rq_export, LPROC_MDT_RMDIR); - break; - case S_IFREG: - case S_IFLNK: - case S_IFCHR: - case S_IFBLK: - case S_IFIFO: - case S_IFSOCK: - mdt_counter_incr(req->rq_export, LPROC_MDT_UNLINK); - break; - default: - CERROR("bad file type %o unlinking\n", ma->ma_attr.la_mode); - LBUG(); - GOTO(out, rc = -EINVAL); + if (ma->ma_valid & MA_INODE) { + switch (ma->ma_attr.la_mode & S_IFMT) { + case S_IFDIR: + mdt_counter_incr(req->rq_export, LPROC_MDT_RMDIR); + break; + case S_IFREG: + case S_IFLNK: + case S_IFCHR: + case S_IFBLK: + case S_IFIFO: + case S_IFSOCK: + mdt_counter_incr(req->rq_export, LPROC_MDT_UNLINK); + break; + default: + LASSERTF(0, "bad file type %o unlinking\n", + ma->ma_attr.la_mode); + } } EXIT; -- 1.8.3.1