LU-1116 kernel: Support RHEL6.2 patchless client.

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 68382e8..fceff9e 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -185,7 +185,7 @@ static inline void mdc_clear_replay_flag(struct ptlrpc_request *req, int rc)
         }
 }
 
-static int round_up(int val)
+static int l_round_up(int val)
 {
         int ret = 1;
         while (val) {
@@ -301,8 +301,9 @@ static struct ptlrpc_request *mdc_intent_open_pack(struct obd_export *exp,
         rc = lustre_msg_size(class_exp2cliimp(exp)->imp_msg_magic,
                              bufcount, size);
         if (rc & (rc - 1))
-                size[bufcount - 1] = min(size[bufcount - 1] + round_up(rc) - rc,
-                                         (__u32)obddev->u.cli.cl_max_mds_easize);
+                size[bufcount - 1] = min(size[bufcount - 1] +
+                                         l_round_up(rc) - rc,
+                                        (__u32)obddev->u.cli.cl_max_mds_easize);
 
         /* If inode is known, cancel conflicting OPEN locks. */
         if (data->fid2.id) {