LU-1994 kernel: fix reference counting with l_dentry_open

[fs/lustre-release.git] / lustre / include / lustre_lite.h

diff --git a/lustre/include/lustre_lite.h b/lustre/include/lustre_lite.h
index ac71d69..4a88dd4 100644 (file)
--- a/lustre/include/lustre_lite.h
+++ b/lustre/include/lustre_lite.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -58,13 +58,6 @@
 #include <lustre_mds.h>
 #include <lustre_ha.h>
 
-#ifdef __KERNEL__
-
-/* careful, this is easy to screw up */
-#define PAGE_CACHE_MAXBYTES ((__u64)(~0UL) << CFS_PAGE_SHIFT)
-
-#endif
-
 /* 4UL * 1024 * 1024 */
 #define LL_MAX_BLKSIZE_BITS     (22)
 #define LL_MAX_BLKSIZE          (1UL<<LL_MAX_BLKSIZE_BITS)
@@ -126,11 +119,11 @@ static inline void lustre_build_lock_params(int cmd, unsigned long open_flags,
 struct lustre_client_ocd {
         /*
          * This is conjunction of connect_flags across all imports (LOVs) this
-         * mount is connected to. This field is updated by ll_ocd_update()
+         * mount is connected to. This field is updated by cl_ocd_update()
          * under ->lco_lock.
          */
         __u64              lco_flags;
-        cfs_semaphore_t    lco_lock;
+       struct mutex       lco_lock;
         struct obd_export *lco_md_exp;
         struct obd_export *lco_dt_exp;
 };
@@ -150,12 +143,11 @@ static inline void ll_dir_chain_fini(struct ll_dir_chain *chain)
 {
 }
 
-static inline unsigned long hash_x_index(__u64 hash)
+static inline unsigned long hash_x_index(__u64 hash, int hash64)
 {
 #ifdef __KERNEL__
-# if BITS_PER_LONG == 32
-        hash >>= 32;
-# endif
+        if (BITS_PER_LONG == 32 && hash64)
+                hash >>= 32;
 #endif
         return ~0UL - hash;
 }