LU-1756 kernel: cleanup lustre_compat25.h

[fs/lustre-release.git] / lustre / include / linux / lvfs.h

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 3d5aa2d..80a9ece 100644 (file)
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.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.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -47,6 +47,7 @@
 
 #if defined __KERNEL__
 #include <linux/lustre_compat25.h>
+#include <linux/lustre_common.h>
 #include <linux/lvfs_linux.h>
 #else
 #include <liblustre.h>
@@ -81,6 +82,7 @@ struct lvfs_run_ctxt {
         int                      ngroups;
         struct lvfs_callback_ops cb_ops;
         struct group_info       *group_info;
+       struct dt_device        *dt;
 #ifdef OBD_CTXT_DEBUG
         __u32                    magic;
 #endif
@@ -113,7 +115,7 @@ static inline void l_dput(struct dentry *de)
         if (!de || IS_ERR(de))
                 return;
         //shrink_dcache_parent(de);
-        LASSERT(cfs_atomic_read(&de->d_count) > 0);
+       LASSERT(d_refcount(de) > 0);
         dput(de);
 }
 
@@ -126,22 +128,22 @@ static inline struct dentry *ll_lookup_one_len(const char *fid_name,
                                                struct dentry *dparent,
                                                int fid_namelen)
 {
-        struct dentry *dchild;
-
-        LOCK_INODE_MUTEX(dparent->d_inode);
-        dchild = lookup_one_len(fid_name, dparent, fid_namelen);
-        UNLOCK_INODE_MUTEX(dparent->d_inode);
-
-        if (IS_ERR(dchild) || dchild->d_inode == NULL)
-                return dchild;
-
-        if (is_bad_inode(dchild->d_inode)) {
-                CERROR("bad inode returned %lu/%u\n",
-                       dchild->d_inode->i_ino, dchild->d_inode->i_generation);
-                dput(dchild);
-                dchild = ERR_PTR(-ENOENT);
-        }
-        return dchild;
+       struct dentry *dchild;
+
+       mutex_lock(&dparent->d_inode->i_mutex);
+       dchild = lookup_one_len(fid_name, dparent, fid_namelen);
+       mutex_unlock(&dparent->d_inode->i_mutex);
+
+       if (IS_ERR(dchild) || dchild->d_inode == NULL)
+               return dchild;
+
+       if (is_bad_inode(dchild->d_inode)) {
+               CERROR("bad inode returned %lu/%u\n",
+                      dchild->d_inode->i_ino, dchild->d_inode->i_generation);
+               dput(dchild);
+               dchild = ERR_PTR(-ENOENT);
+       }
+       return dchild;
 }
 
 static inline void ll_sleep(int t)