- CROW-related fixes from b_hd_mdref

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

diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index 5e3cbd0..8f2189b 100644 (file)
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -1,3 +1,28 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ *  Copyright (C) 2001, 2002, 2003, 2004 Cluster File Systems, Inc.
+ *
+ *  Author: <braam@clusterfs.com>
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * lustre VFS/process permission interface
+ */
+
 #ifndef __LVFS_H__
 #define __LVFS_H__
 
@@ -6,9 +31,11 @@
 #define LL_ID_NAMELEN (16 + 1 + 8 + 1)
 
 #if defined __KERNEL__
+#include <linux/dcache.h>
+#include <linux/namei.h>
 #include <linux/lustre_compat25.h>
 #include <linux/lvfs_linux.h>
-#endif 
+#endif
 
 #ifdef LIBLUSTRE
 #include <lvfs_user_fs.h>
@@ -18,13 +45,14 @@ struct mds_grp_hash_entry;
 
 /* simple.c */
 struct lvfs_ucred {
-        struct mds_grp_hash_entry *luc_ghash;
-        struct group_info *luc_ginfo;
-        __u32 luc_fsuid;
-        __u32 luc_fsgid;
-        __u32 luc_cap;
-        __u32 luc_uid;
-       __u32 luc_umask;
+        struct lustre_sec_desc *luc_lsd;
+        struct group_info      *luc_ginfo;
+        __u32                   luc_uid;
+        __u32                   luc_gid;
+        __u32                   luc_fsuid;
+        __u32                   luc_fsgid;
+        __u32                   luc_cap;
+        __u32                   luc_umask;
 };
 
 struct lvfs_callback_ops {
@@ -52,6 +80,13 @@ struct lvfs_run_ctxt {
 #endif
 };
 
+struct lvfs_obd_ctxt {
+        struct vfsmount *loc_mnt;
+        atomic_t         loc_refcount;
+        char            *loc_name;
+        struct list_head loc_list; 
+};
+
 #ifdef OBD_CTXT_DEBUG
 #define OBD_SET_CTXT_MAGIC(ctxt) (ctxt)->magic = OBD_RUN_CTXT_MAGIC
 #else
@@ -76,7 +111,9 @@ 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, struct list_head *dentry_list);
-
+int lvfs_mount_fs(char *name, char *fstype, char *options, int flags, 
+                  struct lvfs_obd_ctxt **lvfs_ctxt);
+void lvfs_umount_fs(struct lvfs_obd_ctxt *lvfs_ctxt);
 static inline void l_dput(struct dentry *de)
 {
         if (!de || IS_ERR(de))
@@ -91,6 +128,19 @@ void *lock_dir(struct inode *dir, struct qstr *name);
 void unlock_dir(struct inode *dir, void *lock);
 #endif
 
+/*
+ * typeof here is to suppress gcc warnings (gcc4, maybe others too) about wrong
+ * type in assignment. As kernel type may be chnaged we doing it this way.
+ * --umka
+ */
+#define qstr_assign(qstr, n, l)                 \
+do {                                            \
+    typeof(l) _len = (l);                       \
+    typeof(n) _name = (n);                      \
+    (qstr)->name = (typeof((qstr)->name))_name; \
+    (qstr)->len = (typeof((qstr)->len))_len;    \
+} while (0)
+
 /* 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 systems,
  * and instantiating two inodes for the same entry.  We still protect against
@@ -99,12 +149,13 @@ static inline struct dentry *
 ll_lookup_one_len(const char *name, struct dentry *dparent, int namelen)
 {
         struct dentry *dchild;
+        
 #ifdef S_PDIROPS
-       struct qstr qstr;
-       void *lock;
-       qstr.name = name;
-       qstr.len = namelen;
-       lock = lock_dir(dparent->d_inode, &qstr);
+        struct qstr qstr;
+        void *lock;
+
+        qstr_assign(&qstr, name, namelen);
+        lock = lock_dir(dparent->d_inode, &qstr);
 #else
         down(&dparent->d_inode->i_sem);
 #endif
@@ -112,10 +163,21 @@ ll_lookup_one_len(const char *name, struct dentry *dparent, int namelen)
         dchild = lookup_one_len(name, dparent, namelen);
 
 #ifdef S_PDIROPS
-       unlock_dir(dparent->d_inode, lock);
+        unlock_dir(dparent->d_inode, lock);
 #else
         up(&dparent->d_inode->i_sem);
 #endif
+
+        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;
 }