Whamcloud - gitweb
LU-3677 mdt: Set HSM dirty open-for-write file when evicted.
[fs/lustre-release.git] / lustre / include / lustre_lib.h
index bc876ab..c481674 100644 (file)
@@ -105,11 +105,12 @@ struct client_obd *client_conn2cli(struct lustre_handle *conn);
 
 struct md_open_data;
 struct obd_client_handle {
-        struct lustre_handle  och_fh;
-        struct lu_fid         och_fid;
-        struct md_open_data  *och_mod;
-        __u32 och_magic;
-        int och_flags;
+       struct lustre_handle     och_fh;
+       struct lu_fid            och_fid;
+       struct md_open_data     *och_mod;
+       struct lustre_handle     och_lease_handle; /* open lock for lease */
+       __u32                    och_magic;
+       int                      och_flags;
 };
 #define OBD_CLIENT_HANDLE_MAGIC 0xd15ea5ed
 
@@ -789,6 +790,7 @@ do {                                                                           \
 } while (0)
 
 #else /* !__KERNEL__ */
+
 #define __l_wait_event(wq, condition, info, ret, l_add_wait)            \
 do {                                                                    \
         long __timeout = info->lwi_timeout;                             \
@@ -831,7 +833,6 @@ do {                                                                    \
                         }                                               \
                 }                                                       \
         }                                                               \
-        SET_BUT_UNUSED(wq);                                             \
 } while (0)
 
 #endif /* __KERNEL__ */