ORNL-22 general ptlrpcd threads pool support

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_iam.c

diff --git a/lustre/osd-ldiskfs/osd_iam.c b/lustre/osd-ldiskfs/osd_iam.c
index ab036a2..d949fa5 100644 (file)
--- a/lustre/osd-ldiskfs/osd_iam.c
+++ b/lustre/osd-ldiskfs/osd_iam.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -116,7 +116,6 @@
 #include "osd_internal.h"
 
 #include "xattr.h"
-#include "iopen.h"
 #include "acl.h"
 
 /*
@@ -1643,7 +1642,7 @@ static int iam_shift_entries(struct iam_path *path,
         count2 = count - count1;
         dx_get_ikey(path, iam_entry_shift(path, entries, count1), pivot);
 
-        dxtrace(printk("Split index %i/%i\n", count1, count2));
+        dxtrace(printk("Split index %d/%d\n", count1, count2));
 
         memcpy((char *) iam_entry_shift(path, entries2, delta),
                (char *) iam_entry_shift(path, entries, count1),