Merge "LU-9771 flr: Merge branch 'flr'"

[fs/lustre-release.git] / lustre / include / lustre_nodemap.h

diff --git a/lustre/include/lustre_nodemap.h b/lustre/include/lustre_nodemap.h
index d8553e9..3511517 100644 (file)
--- a/lustre/include/lustre_nodemap.h
+++ b/lustre/include/lustre_nodemap.h
@@ -27,7 +27,7 @@
 #ifndef _LUSTRE_NODEMAP_H
 #define _LUSTRE_NODEMAP_H
 
-#include <lustre/lustre_idl.h>
+#include <uapi/linux/lustre/lustre_idl.h>
 
 #define LUSTRE_NODEMAP_NAME "nodemap"
 
@@ -85,7 +85,7 @@ struct lu_nodemap {
        /* NID range list */
        struct list_head         nm_ranges;
        /* lock for idmap red/black trees */
-       rwlock_t                 nm_idmap_lock;
+       struct rw_semaphore      nm_idmap_lock;
        /* UID map keyed by local UID */
        struct rb_root           nm_fs_to_client_uidmap;
        /* UID map keyed by remote UID */