X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flvfs.h;h=5e3888076424d3eec101afeccd8beecf23dfce80;hp=3585660212761afd6c29bf902a1ce23c1d1c7249;hb=e3a7c58aebafce40323db54bf6056029e5af4a70;hpb=c39489126f88bb5b30643ebb11c72fbe9f9d2241 diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h index 3585660..5e38880 100644 --- a/lustre/include/linux/lvfs.h +++ b/lustre/include/linux/lvfs.h @@ -1,30 +1,68 @@ -#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. + */ +/* + * 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 +#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 instead +#endif #if defined __KERNEL__ #include #include -#endif - -#ifdef LIBLUSTRE -#include +#else +#include #endif -struct mds_grp_hash_entry; +#define LLOG_LVFS /* 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; + __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 { @@ -34,19 +72,14 @@ 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 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 }; @@ -57,38 +90,31 @@ struct lvfs_run_ctxt { #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_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, struct list_head *dentry_list); +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(atomic_read(&de->d_count) > 0); + LASSERT(cfs_atomic_read(&de->d_count) > 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 @@ -99,37 +125,29 @@ static inline struct dentry *ll_lookup_one_len(const char *fid_name, 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 + LOCK_INODE_MUTEX(dparent->d_inode); dchild = lookup_one_len(fid_name, dparent, fid_namelen); + UNLOCK_INODE_MUTEX(dparent->d_inode); -#ifdef S_PDIROPS - 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; } 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