Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Land b_smallfix onto HEAD (20040223_1817)
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_lib.c
diff --git
a/lustre/ldlm/ldlm_lib.c
b/lustre/ldlm/ldlm_lib.c
index
d1e2b49
..
2787619
100644
(file)
--- a/
lustre/ldlm/ldlm_lib.c
+++ b/
lustre/ldlm/ldlm_lib.c
@@
-93,8
+93,8
@@
int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
sema_init(&cli->cl_sem, 1);
cli->cl_conn_count = 0;
sema_init(&cli->cl_sem, 1);
cli->cl_conn_count = 0;
- memcpy(server_uuid.uuid, lcfg->lcfg_inlbuf2,
min(lcfg->lcfg_inllen2,
-
sizeof(server_uuid)));
+ memcpy(server_uuid.uuid, lcfg->lcfg_inlbuf2,
+
min_t(unsigned int, lcfg->lcfg_inllen2,
sizeof(server_uuid)));
cli->cl_dirty = 0;
cli->cl_avail_grant = 0;
cli->cl_dirty = 0;
cli->cl_avail_grant = 0;