Branch b1_6

b=14241
i=adilger
i=scjody

trivial fix for type clash in format string to fix compile error on Cray XT3.

diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 7b6079d..2a97171 100644 (file)
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -450,7 +450,7 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
 
                 if (rc < sizeof(*md->lsm)) {
                         CERROR ("lsm size too small:  rc < sizeof (*md->lsm) "
-                                "(%d < %d)\n", rc, sizeof(*md->lsm));
+                                "(%d < "LPSZ")\n", rc, sizeof(*md->lsm));
                         GOTO(err_out, rc = -EPROTO);
                 }
                 rc = 0;