X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Flustre_mdc.h;h=1bfa2a8e193ee63ea72b7eb47ac48ab4b707b37c;hb=1a24137e8f26eaae9a2dac39a1e8a8a0bed46b6b;hp=d2c30d3c225f144b27e96777f4ab2a9d74ac2a07;hpb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;p=fs%2Flustre-release.git diff --git a/lustre/include/lustre_mdc.h b/lustre/include/lustre_mdc.h index d2c30d3..1bfa2a8 100644 --- a/lustre/include/lustre_mdc.h +++ b/lustre/include/lustre_mdc.h @@ -1,7 +1,39 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * This file is part of Lustre, http://www.lustre.org + * 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 2008 Sun Microsystems, Inc. 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/lustre_mdc.h * * MDS data structures. * See also lustre_idl.h for wire formats of requests. @@ -14,11 +46,19 @@ # include # include # ifdef CONFIG_FS_POSIX_ACL -# include -# endif -#endif +# ifdef HAVE_XATTR_ACL +# include +# endif /*HAVE_XATTR_ACL */ +# ifdef HAVE_LINUX_POSIX_ACL_XATTR_H +# include +# endif /* HAVE_LINUX_POSIX_ACL_XATTR_H */ +# endif /* CONFIG_FS_POSIX_ACL */ +# ifndef HAVE_VFS_INTENT_PATCHES +# include +# endif /* HAVE_VFS_INTENT_PATCHES */ +#endif /* __KERNEL__ */ #include -#include +#include #include #include #include @@ -65,7 +105,7 @@ static inline void mdc_put_rpc_lock(struct mdc_rpc_lock *lck, struct mdc_cache_waiter { struct list_head mcw_entry; - wait_queue_head_t mcw_waitq; + cfs_waitq_t mcw_waitq; }; /* mdc/mdc_locks.c */