X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flvfs.h;h=fffb4bd67977c98732a1e217298b4490a095dda5;hb=c1f6b32958c799412c830f35f8d16ed7275407ea;hp=008fcb7f09549a35fa607cba9b8d9979c908f818;hpb=344a777d544a05a8c11f86c0f3e8e5945406dc14;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h index 008fcb7..fffb4bd 100644 --- a/lustre/include/linux/lvfs.h +++ b/lustre/include/linux/lvfs.h @@ -1,9 +1,7 @@ /* -*- 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: + * Copyright (C) 2001 Cluster File Systems, Inc. * * This file is part of Lustre, http://www.lustre.org. * @@ -23,96 +21,71 @@ * lustre VFS/process permission interface */ -#ifndef __LVFS_H__ -#define __LVFS_H__ - -#include +#ifndef __LINUX_LVFS_H__ +#define __LINUX_LVFS_H__ -#define LL_ID_NAMELEN (16 + 1 + 8 + 1) +#ifndef __LVFS_H__ +#error Do not #include this file directly. #include instead +#endif #if defined __KERNEL__ -#include -#include #include #include +#else +struct group_info { /* unused */ }; +#include #endif -#ifdef LIBLUSTRE -#include -#endif - -struct mds_grp_hash_entry; +#define LLOG_LVFS /* simple.c */ + struct lvfs_ucred { - struct lustre_sec_desc *luc_lsd; - struct group_info *luc_ginfo; - __u32 luc_fsuid; - __u32 luc_fsgid; - __u32 luc_cap; - __u32 luc_uid; - __u32 luc_umask; + __u32 luc_uid; + __u32 luc_gid; + __u32 luc_fsuid; + __u32 luc_fsgid; + __u32 luc_cap; + __u32 luc_umask; + struct group_info *luc_ginfo; + struct md_identity *luc_identity; }; struct lvfs_callback_ops { - struct dentry *(*l_id2dentry)(__u64 ino, __u32 gen, - __u64 gr, void *data); + 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 vfsmount *pwdmnt; struct dentry *pwd; mm_segment_t fs; struct lvfs_ucred luc; - struct lvfs_callback_ops cb_ops; int ngroups; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4) + struct lvfs_callback_ops cb_ops; struct group_info *group_info; -#else - struct group_info group_info; -#endif #ifdef OBD_CTXT_DEBUG - int pid; __u32 magic; #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 #define OBD_SET_CTXT_MAGIC(ctxt) do {} while(0) #endif -/* lvfs_common.c */ -struct dentry *lvfs_id2dentry(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_rename(struct dentry *dir, 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, 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)) @@ -122,36 +95,20 @@ static inline void l_dput(struct dentry *de) 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 protect against - * concurrent addition/removal races with the DLM locking. */ -static inline struct dentry * -ll_lookup_one_len(const char *name, struct dentry *dparent, int namelen) +/* 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 concurrent addition/removal races with the DLM locking. + */ +static inline struct dentry *ll_lookup_one_len(const char *fid_name, + struct dentry *dparent, + int fid_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); -#else - down(&dparent->d_inode->i_sem); -#endif - dchild = lookup_one_len(name, dparent, namelen); - -#ifdef S_PDIROPS - unlock_dir(dparent->d_inode, lock); -#else - up(&dparent->d_inode->i_sem); -#endif + 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; @@ -162,7 +119,6 @@ ll_lookup_one_len(const char *name, struct dentry *dparent, int namelen) dput(dchild); dchild = ERR_PTR(-ENOENT); } - return dchild; } @@ -174,10 +130,4 @@ static inline void ll_sleep(int t) } #endif -static inline int ll_id2str(char *str, __u64 id, __u32 generation) -{ - return sprintf(str, "%llx:%08x", (unsigned long long)id, - generation); -} - #endif