LU-2049 grant: Fix grant interop with pre-GRANT_PARAM clients

[fs/lustre-release.git] / lustre / utils / lustre_rsync.c

diff --git a/lustre/utils/lustre_rsync.c b/lustre/utils/lustre_rsync.c
index 8a572b0..2be588c 100644 (file)
--- a/lustre/utils/lustre_rsync.c
+++ b/lustre/utils/lustre_rsync.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2014, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -103,6 +103,7 @@
  *      [pfid,tfid,name] tracked from (1) is used for this.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -118,11 +119,12 @@
 #include <utime.h>
 #include <time.h>
 #include <sys/xattr.h>
+#include <linux/types.h>
 
+#include <libcfs/libcfs_debug.h>
 #include <libcfs/util/string.h>
 #include <libcfs/util/parser.h>
 #include <lustre/lustreapi.h>
-#include <lustre/lustre_idl.h>
 #include "lustre_rsync.h"
 
 #define REPLICATE_STATUS_VER 1
@@ -909,7 +911,7 @@ int lr_move(struct lr_info *info)
         int special_dest = 0;
        char srcpath[PATH_MAX + 1] = "";
 
-       LASSERT(info->is_extended);
+       assert(info->is_extended);
 
        rc_src = lr_get_path(info, info->spfid);
        if (rc_src < 0 && rc_src != -ENOENT)