From: Eric Mei <eric.mei@oracle.com>
Date: Mon, 1 Nov 2010 16:15:02 +0000 (-0600)
Subject: b=24007 obj mode should be covered by MA_INODE.
X-Git-Tag: 2.0.55.0~11
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=1f87c9cd4d642bc03bc2df24a61a0fa0f3441a0c

b=24007 obj mode should be covered by MA_INODE.

r=di.wang
r=vitaly.fertman
---

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;