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
b=24037 Changes of 2.6.32 kernel.
[fs/lustre-release.git]
/
lustre
/
liblustre
/
lutil.c
diff --git
a/lustre/liblustre/lutil.c
b/lustre/liblustre/lutil.c
index
ba0fd2f
..
dead71b
100644
(file)
--- a/
lustre/liblustre/lutil.c
+++ b/
lustre/liblustre/lutil.c
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-128,7
+128,7
@@
void liblustre_init_random()
if (_rand_dev_fd >= 0) {
if (syscall(SYS_read, _rand_dev_fd,
&seed, sizeof(seed)) == sizeof(seed)) {
if (_rand_dev_fd >= 0) {
if (syscall(SYS_read, _rand_dev_fd,
&seed, sizeof(seed)) == sizeof(seed)) {
-
ll
_srand(seed[0], seed[1]);
+
cfs
_srand(seed[0], seed[1]);
syscall(SYS_close, _rand_dev_fd);
return;
}
syscall(SYS_close, _rand_dev_fd);
return;
}
@@
-142,7
+142,7
@@
void liblustre_init_random()
seed[0] = _my_pnid;
#endif
gettimeofday(&tv, NULL);
seed[0] = _my_pnid;
#endif
gettimeofday(&tv, NULL);
-
ll
_srand(tv.tv_sec ^ __swab32(seed[0]), tv.tv_usec ^__swab32(getpid()));
+
cfs
_srand(tv.tv_sec ^ __swab32(seed[0]), tv.tv_usec ^__swab32(getpid()));
}
static void init_capability(__u32 *res)
}
static void init_capability(__u32 *res)
@@
-182,7
+182,7
@@
static void init_capability(__u32 *res)
#endif
}
#endif
}
-int
in_group_p
(gid_t gid)
+int
cfs_curproc_is_in_groups
(gid_t gid)
{
int i;
{
int i;