X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_mds.h;h=ede98c7035b92c5115f9e75562f521cf9013f989;hb=a046e879fcadd601c9a19fd906f82ecbd2d4efd5;hp=b0b9a6a7529fa39eed5949fb72d8b39eb2940ee7;hpb=2df78a6bed71281526a86611e30bfb11b2f545a3;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
index b0b9a6a..ede98c7 100644
--- a/lustre/include/lustre_mds.h
+++ b/lustre/include/lustre_mds.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,17 +15,15 @@
  *
  * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,24 +38,18 @@
 #ifndef _LUSTRE_MDS_H
 #define _LUSTRE_MDS_H
 
+/** \defgroup mds mds
+ *
+ * @{
+ */
+
 #include <lustre_handles.h>
 #include <libcfs/libcfs.h>
-#include <lustre/lustre_idl.h>
+#include <uapi/linux/lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_dlm.h>
-#include <lustre_log.h>
 #include <lustre_export.h>
 
-#if defined(__linux__)
-#include <linux/lustre_mds.h>
-#elif defined(__APPLE__)
-#include <darwin/lustre_mds.h>
-#elif defined(__WINNT__)
-#include <winnt/lustre_mds.h>
-#else
-#error Unsupported operating system.
-#endif
-
 struct mds_group_info {
         struct obd_uuid *uuid;
         int group;
@@ -70,27 +60,15 @@ struct mds_capa_info {
         struct lustre_capa_key *capa;
 };
 
-/* mds/mds_lov.c */
-int mds_lov_write_objids(struct obd_device *obd);
-int mds_lov_prepare_objids(struct obd_device *obd, struct lov_mds_md *lmm);
-void mds_lov_update_objids(struct obd_device *obd, struct lov_mds_md *lmm);
-int mds_log_op_unlink(struct obd_device *, struct lov_mds_md *, int,
-                      struct llog_cookie *, int);
-
-
 #define MDD_OBD_NAME     "mdd_obd"
 #define MDD_OBD_UUID     "mdd_obd_uuid"
-#define MDD_OBD_TYPE     "mds"
 
-static inline int md_should_create(__u32 flags)
+static inline int md_should_create(__u64 flags)
 {
-       return !(flags & MDS_OPEN_DELAY_CREATE ||
-               !(flags & FMODE_WRITE));
+	return !(flags & MDS_OPEN_DELAY_CREATE) && (flags & FMODE_WRITE) &&
+               !(flags & MDS_OPEN_LEASE);
 }
 
-/* these are local flags, used only on the client, private */
-#define M_CHECK_STALE           0200000000
-#define M_JOIN_FILE             0400000000 /* its counterpart is
-                                            * MDS_OPEN_JOIN_FILE */
+/** @} mds */
 
 #endif