LU-3259 clio: cl_lock simplification

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

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 020e039..8e7405d 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.
@@ -28,6 +26,8 @@
 /*
  * 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/
@@ -45,44 +45,22 @@
 #error Do not #include this file directly. #include <lvfs.h> instead
 #endif
 
-#if defined __KERNEL__
 #include <linux/lustre_compat25.h>
-#include <linux/lvfs_linux.h>
-#else
-#include <liblustre.h>
-#endif
+#include <linux/fs.h>
 
-#define LLOG_LVFS
+#define OBD_RUN_CTXT_MAGIC     0xC0FFEEAA
+#define OBD_CTXT_DEBUG         /* development-only debugging */
 
-/* simple.c */
+struct dt_device;
 
-struct lvfs_ucred {
-        __u32                   luc_uid;
-        __u32                   luc_gid;
-        __u32                   luc_fsuid;
-        __u32                   luc_fsgid;
-        cfs_kernel_cap_t        luc_cap;
-        __u32                   luc_umask;
-       struct group_info      *luc_ginfo;
-       struct md_identity     *luc_identity;
-};
-
-struct lvfs_callback_ops {
-        struct dentry *(*l_fid2dentry)(__u64 id_ino, __u32 gen, __u64 gr, void *data);
-};
-
-#define OBD_RUN_CTXT_MAGIC      0xC0FFEEAA
-#define OBD_CTXT_DEBUG          /* development-only debugging */
 struct lvfs_run_ctxt {
-        struct vfsmount         *pwdmnt;
-        struct dentry           *pwd;
-        mm_segment_t             fs;
-        struct lvfs_ucred        luc;
-        int                      ngroups;
-        struct lvfs_callback_ops cb_ops;
-        struct group_info       *group_info;
+       struct vfsmount         *pwdmnt;
+       struct dentry           *pwd;
+       mm_segment_t             fs;
+       uint32_t                 umask;
+       struct dt_device        *dt;
 #ifdef OBD_CTXT_DEBUG
-        __u32                    magic;
+       uint32_t                magic;
 #endif
 };
 
@@ -92,30 +70,6 @@ struct lvfs_run_ctxt {
 #define OBD_SET_CTXT_MAGIC(ctxt) do {} while(0)
 #endif
 
-#ifdef __KERNEL__
-
-struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt, 
-                            const char *name, int mode, int fix);
-struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix);
-int lustre_rename(struct dentry *dir, struct vfsmount *mnt, char *oldname,
-                  char *newname);
-int lustre_fread(struct file *file, void *buf, int len, loff_t *off);
-int lustre_fwrite(struct file *file, const void *buf, int len, loff_t *off);
-int lustre_fsync(struct file *file);
-long l_readdir(struct file * file, cfs_list_t *dentry_list);
-int l_notify_change(struct vfsmount *mnt, struct dentry *dchild,
-                    struct iattr *newattrs);
-int simple_truncate(struct dentry *dir, struct vfsmount *mnt,
-                               char *name, loff_t length);
-
-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);
-        dput(de);
-}
 
 /* We need to hold the inode semaphore over the dcache lookup itself, or we
  * run the risk of entering the filesystem lookup path concurrently on SMP
@@ -126,30 +80,23 @@ 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)
-{
-        cfs_set_current_state(CFS_TASK_INTERRUPTIBLE);
-        cfs_schedule_timeout(t * CFS_HZ);
-        cfs_set_current_state(CFS_TASK_RUNNING);
-}
-#endif
 
 #endif