X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flvfs.h;h=f9495528b291d6bf35e5606cac4fc7de78fcaaf9;hb=f52ece3201af131a7bb8a7b2766d3f0a98c00fca;hp=1cc27c4fd98d32117f24672de8eb8efd98f552a4;hpb=ca6dd9a48e7b3ebf5df8a78c8ed65f7676cebf4d;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h index 1cc27c4..f949552 100644 --- a/lustre/include/linux/lvfs.h +++ b/lustre/include/linux/lvfs.h @@ -1,22 +1,37 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2001 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * 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. * - * 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. + * 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). * - * 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 + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * 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. + * 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 */ @@ -32,16 +47,11 @@ #include #include #else -struct group_info { /* unused */ }; #include #endif #define LLOG_LVFS -/* lvfs.c */ -int obd_alloc_fail(const void *ptr, const char *name, const char *type, - size_t size, const char *file, int line); - /* simple.c */ struct lvfs_ucred { @@ -49,10 +59,10 @@ struct lvfs_ucred { __u32 luc_gid; __u32 luc_fsuid; __u32 luc_fsgid; - __u32 luc_cap; + cfs_kernel_cap_t luc_cap; __u32 luc_umask; struct group_info *luc_ginfo; - struct mdt_identity *luc_identity; + struct md_identity *luc_identity; }; struct lvfs_callback_ops { @@ -82,20 +92,26 @@ struct lvfs_run_ctxt { #ifdef __KERNEL__ -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, char *oldname, char *newname); +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(d_refcount(de) > 0); dput(de); } @@ -108,29 +124,29 @@ static inline struct dentry *ll_lookup_one_len(const char *fid_name, struct dentry *dparent, int fid_namelen) { - struct dentry *dchild; - - 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; - - 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; + 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