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

diff --cc lustre/include/lustre/lustreapi.h
index 3bae89c,ab87e15..165e1fe
--- 1/lustre/include/lustre/lustreapi.h
--- 2/lustre/include/lustre/lustreapi.h
+++ b/lustre/include/lustre/lustreapi.h
@@@ -819,10 -893,18 +901,22 @@@ int llapi_layout_file_comp_set(const ch
   */
  bool llapi_layout_is_composite(struct llapi_layout *layout);
  
+ /**
+  * FLR: mirror operation APIs
+  */
+ int llapi_mirror_set(int fd, unsigned int id);
+ int llapi_mirror_clear(int fd);
+ ssize_t llapi_mirror_read(int fd, unsigned int id,
+                          void *buf, size_t count, off_t pos);
+ ssize_t llapi_mirror_copy_many(int fd, unsigned int src,
+                               unsigned int *dst, size_t count);
+ int llapi_mirror_copy(int fd, unsigned int src, unsigned int dst,
+                      off_t pos, size_t count);
+ 
  /** @} llapi */
  
 +#if defined(__cplusplus)
 +}
 +#endif
 +
  #endif

diff --cc lustre/include/obd_support.h
Simple merge

diff --cc lustre/include/uapi/linux/lustre/lustre_idl.h
Simple merge

diff --cc lustre/include/uapi/linux/lustre/lustre_user.h
Simple merge

diff --cc lustre/ldlm/ldlm_request.c
Simple merge

diff --cc lustre/llite/file.c
Simple merge

diff --cc lustre/mdd/mdd_internal.h
Simple merge

diff --cc lustre/mdd/mdd_object.c
Simple merge

diff --cc lustre/mdt/mdt_handler.c
Simple merge

diff --cc lustre/mdt/mdt_open.c
Simple merge

diff --cc lustre/osp/osp_sync.c
Simple merge

diff --cc lustre/tests/multiop.c
index 90dd413,750e31e..7e9f5d6
--- 1/lustre/tests/multiop.c
--- 2/lustre/tests/multiop.c
+++ b/lustre/tests/multiop.c
@@@ -216,10 -216,9 +216,9 @@@ int main(int argc, char **argv
        int                      save_errno;
        int                      verbose = 0;
        int                      gid = 0;
 -      lustre_fid               fid;
 +      struct lu_fid            fid;
        struct timespec          ts;
        struct lov_user_md_v3    lum;
-       __u64                    dv;
  
          if (argc < 3) {
                  fprintf(stderr, usage, argv[0]);

diff --cc lustre/tests/sanity-hsm.sh
Simple merge

diff --cc lustre/tests/sanity-lfsck.sh
Simple merge

diff --cc lustre/tests/sanity.sh
Simple merge

diff --cc lustre/utils/lfs.c
Simple merge

diff --cc lustre/utils/liblustreapi.c
Simple merge

diff --cc lustre/utils/liblustreapi_layout.c
Simple merge