X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flvfs.h;h=652d8d247ce2a27dda55a2653474ac0f21980d9a;hb=0df1a34ae0b754a8a99d6a2b32637dd3c37108e2;hp=b18769f0c6c444c960c30957b2802ead324aa94d;hpb=090c677210ee2946d99c71412e4ff762bb300f4f;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h index b18769f..652d8d2 100644 --- a/lustre/include/linux/lvfs.h +++ b/lustre/include/linux/lvfs.h @@ -1,25 +1,71 @@ -#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 +#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 #include -#endif - -#ifdef LIBLUSTRE -#include +#else +#include #endif +#define LLOG_LVFS + /* simple.c */ -struct obd_ucred { - __u32 ouc_fsuid; - __u32 ouc_fsgid; - __u32 ouc_cap; - __u32 ouc_suppgid1; - __u32 ouc_suppgid2; + +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 { @@ -28,15 +74,17 @@ struct lvfs_callback_ops { #define OBD_RUN_CTXT_MAGIC 0xC0FFEEAA #define OBD_CTXT_DEBUG /* development-only debugging */ -struct obd_run_ctxt { - struct vfsmount *pwdmnt; - struct dentry *pwd; - mm_segment_t fs; - struct obd_ucred ouc; - int ngroups; +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 dt_device *dt; #ifdef OBD_CTXT_DEBUG - __u32 magic; + __u32 magic; #endif }; @@ -46,29 +94,17 @@ struct obd_run_ctxt { #define OBD_SET_CTXT_MAGIC(ctxt) do {} while(0) #endif -/* lvfs_common.c */ -struct dentry *lvfs_fid2dentry(struct obd_run_ctxt *, __u64, __u32, __u64 ,void *data); - -void push_ctxt(struct obd_run_ctxt *save, struct obd_run_ctxt *new_ctx, - struct obd_ucred *cred); -void pop_ctxt(struct obd_run_ctxt *saved, struct obd_run_ctxt *new_ctx, - struct obd_ucred *cred); - #ifdef __KERNEL__ -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); +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); } @@ -81,26 +117,24 @@ static inline struct dentry *ll_lookup_one_len(const char *fid_name, struct dentry *dparent, int fid_namelen) { - struct dentry *dchild; - - down(&dparent->d_inode->i_sem); - dchild = lookup_one_len(fid_name, dparent, fid_namelen); - up(&dparent->d_inode->i_sem); - - 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); -} #endif -static inline int ll_fid2str(char *str, __u64 id, __u32 generation) -{ - return sprintf(str, "%llx:%08x", (unsigned long long)id, generation); -} - #endif