-#ifndef __LVFS_H__
-#define __LVFS_H__
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * 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/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/include/linux/lvfs.h
+ *
+ * lustre VFS/process permission interface
+ */
-#include <linux/kp30.h>
+#ifndef __LINUX_LVFS_H__
+#define __LINUX_LVFS_H__
-#define LL_FID_NAMELEN (16 + 1 + 8 + 1)
+#ifndef __LVFS_H__
+#error Do not #include this file directly. #include <lvfs.h> instead
+#endif
#if defined __KERNEL__
+#include <linux/lustre_compat25.h>
+#include <linux/lustre_common.h>
#include <linux/lvfs_linux.h>
-#endif
-
-#ifdef LIBLUSTRE
-#include <lvfs_user_fs.h>
+#else
+#include <liblustre.h>
#endif
+#define LLOG_LVFS
+
/* simple.c */
+
struct lvfs_ucred {
- __u32 luc_fsuid;
- __u32 luc_fsgid;
- __u32 luc_cap;
- __u32 luc_suppgid1;
- __u32 luc_suppgid2;
+ __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 {
#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 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 dt_device *dt;
#ifdef OBD_CTXT_DEBUG
- int pid;
- __u32 magic;
+ __u32 magic;
#endif
};
#define OBD_SET_CTXT_MAGIC(ctxt) do {} while(0)
#endif
-/* lvfs_common.c */
-struct dentry *lvfs_fid2dentry(struct lvfs_run_ctxt *, __u64, __u32, __u64 ,void *data);
-
-void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
- struct lvfs_ucred *cred);
-void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
- struct lvfs_ucred *cred);
-
#ifdef __KERNEL__
-int lvfs_reint(struct super_block *sb, void *r_rec);
-int lvfs_undo(struct super_block *sb, void *r_rec);
-struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix);
-struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix);
-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);
+
+struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt,
+ const char *name, int mode, int fix);
+int lustre_rename(struct dentry *dir, struct vfsmount *mnt, char *oldname,
+ char *newname);
static inline void l_dput(struct dentry *de)
{
if (!de || IS_ERR(de))
return;
//shrink_dcache_parent(de);
- LASSERT(atomic_read(&de->d_count) > 0);
+ LASSERT(d_refcount(de) > 0);
dput(de);
}
-#ifdef S_PDIROPS
-void *lock_dir(struct inode *dir, struct qstr *name);
-void unlock_dir(struct inode *dir, void *lock);
-#endif
-
/* 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
struct dentry *dparent,
int fid_namelen)
{
- struct dentry *dchild;
-#ifdef S_PDIROPS
- struct qstr qstr;
- void *lock;
- qstr.name = fid_name;
- qstr.len = fid_namelen;
- lock = lock_dir(dparent->d_inode, &qstr);
-#else
- down(&dparent->d_inode->i_sem);
-#endif
-
- dchild = lookup_one_len(fid_name, dparent, fid_namelen);
-
-#ifdef S_PDIROPS
- unlock_dir(dparent->d_inode, lock);
-#else
- up(&dparent->d_inode->i_sem);
-#endif
- 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)
{
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(t * HZ);
- set_current_state(TASK_RUNNING);
+ cfs_set_current_state(CFS_TASK_INTERRUPTIBLE);
+ cfs_schedule_timeout(t * CFS_HZ);
+ cfs_set_current_state(CFS_TASK_RUNNING);
}
#endif
-static inline int ll_fid2str(char *str, __u64 id, __u32 generation)
-{
- return sprintf(str, "%llx:%08x", (unsigned long long)id, generation);
-}
-
#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff