X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_mds.h;h=cb43281574890c0b5b9f0ce8d1a70a34629dbdc3;hb=d6ce546eb7e250237141d3a11380f9d5389c50eb;hp=00e6a405d0fc0de69b1e279320f07fb6ff3d317d;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_mds.h b/lustre/include/lustre_mds.h
index 00e6a40..cb43281 100644
--- a/lustre/include/lustre_mds.h
+++ b/lustre/include/lustre_mds.h
@@ -15,11 +15,7 @@
  *
  * 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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -49,22 +45,11 @@
 
 #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;
@@ -75,26 +60,35 @@ 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);
-
+struct md_rejig_data {
+	struct md_object	*mrd_obj;
+	__u16			mrd_mirror_id;
+};
 
 #define MDD_OBD_NAME     "mdd_obd"
 #define MDD_OBD_UUID     "mdd_obd_uuid"
-#define MDD_OBD_TYPE     "mds"
 
-static inline int md_should_create(__u64 flags)
+static inline int md_should_create(u64 open_flags)
 {
-       return !(flags & MDS_OPEN_DELAY_CREATE ||
-               !(flags & FMODE_WRITE));
+	return !(open_flags & MDS_OPEN_DELAY_CREATE) &&
+		(open_flags & MDS_FMODE_WRITE) &&
+	       !(open_flags & MDS_OPEN_LEASE);
 }
 
-/* these are local flags, used only on the client, private */
-#define M_CHECK_STALE           0200000000
+/* do NOT or the MAY_*'s, you'll get the weakest */
+static inline int mds_accmode(u64 open_flags)
+{
+	int res = 0;
+
+	if (open_flags & MDS_FMODE_READ)
+		res |= MAY_READ;
+	if (open_flags & (MDS_FMODE_WRITE | MDS_OPEN_TRUNC | MDS_OPEN_APPEND))
+		res |= MAY_WRITE;
+	if (open_flags & MDS_FMODE_EXEC)
+		res = MAY_EXEC;
+
+	return res;
+}
 
 /** @} mds */