From: Matt Wu <matt@ext2fsd.com>
Date: Tue, 7 Dec 2010 11:25:54 +0000 (+0800)
Subject: b=24243 Invalid WNC intent lock makes server LBUG
X-Git-Tag: 2.0.59.0~40
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d21e502ec3a201b9b2a5b31c384e187296882d25;ds=sidebyside

b=24243 Invalid WNC intent lock makes server LBUG

i=andreas.dilger
i=oleg.drokin

do not grant PDO locks for non-dir objects, but return -ENOTDIR instead.
---

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index da97a53..7300d48 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -2209,7 +2209,8 @@ int mdt_object_lock(struct mdt_thread_info *info, struct mdt_object *o,
                         RETURN(-ESTALE);
                 } else {
                         /* Non-dir object shouldn't have PDO lock */
-                        LASSERT(S_ISDIR(lu_object_attr(&o->mot_obj.mo_lu)));
+                        if (!S_ISDIR(lu_object_attr(&o->mot_obj.mo_lu)))
+                                RETURN(-ENOTDIR);
                 }
         }