From: alex <alex>
Date: Sat, 2 Jul 2005 05:38:47 +0000 (+0000)
Subject: - minor change to prevent warnings
X-Git-Tag: v1_7_100~1137
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=00097a75276ff4be42b25364d37351b54e741c90;p=fs%2Flustre-release.git

- minor change to prevent warnings
---

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index ede5dcd..719bd86 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -338,8 +338,8 @@ int ll_file_open(struct inode *inode, struct file *file)
         struct lov_stripe_md *lsm;
         struct ptlrpc_request *req;
         int rc = 0;
-        struct obd_client_handle **och_p;
-        __u64 *och_usecount;
+        struct obd_client_handle **och_p = NULL;
+        __u64 *och_usecount = NULL;
         ENTRY;
 
         CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p), flags %o\n",
diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index c329318..c70a5f1 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -168,8 +168,11 @@ int ll_mdc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 
                 /* For lookup locks: Invalidate all dentries associated with
                    this inode, for UPDATE locks - invalidate directory pages */
-                if (inode == NULL)
+                if (inode == NULL) {
+                        if (bits & MDS_INODELOCK_OPEN)
+                                LDLM_ERROR(lock, "null inode");
                         break;
+                }
 
                 if (lock->l_resource->lr_name.name[0] != id_fid(&li->lli_id) ||
                     lock->l_resource->lr_name.name[1] != id_group(&li->lli_id)) {