git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ocfs2
/
dlm
/
dlmmaster.c
diff --git
a/fs/ocfs2/dlm/dlmmaster.c
b/fs/ocfs2/dlm/dlmmaster.c
index
9503240
..
0ad8720
100644
(file)
--- a/
fs/ocfs2/dlm/dlmmaster.c
+++ b/
fs/ocfs2/dlm/dlmmaster.c
@@
-221,7
+221,7
@@
EXPORT_SYMBOL_GPL(dlm_dump_all_mles);
#endif /* 0 */
#endif /* 0 */
-static
kmem_cache_t
*dlm_mle_cache = NULL;
+static
struct kmem_cache
*dlm_mle_cache = NULL;
static void dlm_mle_release(struct kref *kref);
static void dlm_mle_release(struct kref *kref);
@@
-740,6
+740,7
@@
struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm,
*/
struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,
const char *lockid,
*/
struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,
const char *lockid,
+ int namelen,
int flags)
{
struct dlm_lock_resource *tmpres=NULL, *res=NULL;
int flags)
{
struct dlm_lock_resource *tmpres=NULL, *res=NULL;
@@
-748,13
+749,12
@@
struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,
int blocked = 0;
int ret, nodenum;
struct dlm_node_iter iter;
int blocked = 0;
int ret, nodenum;
struct dlm_node_iter iter;
- unsigned int
namelen,
hash;
+ unsigned int hash;
int tries = 0;
int bit, wait_on_recovery = 0;
BUG_ON(!lockid);
int tries = 0;
int bit, wait_on_recovery = 0;
BUG_ON(!lockid);
- namelen = strlen(lockid);
hash = dlm_lockid_hash(lockid, namelen);
mlog(0, "get lockres %s (len %d)\n", lockid, namelen);
hash = dlm_lockid_hash(lockid, namelen);
mlog(0, "get lockres %s (len %d)\n", lockid, namelen);
@@
-1939,7
+1939,7
@@
int dlm_dispatch_assert_master(struct dlm_ctxt *dlm,
int ignore_higher, u8 request_from, u32 flags)
{
struct dlm_work_item *item;
int ignore_higher, u8 request_from, u32 flags)
{
struct dlm_work_item *item;
- item = k
calloc(1,
sizeof(*item), GFP_NOFS);
+ item = k
zalloc(
sizeof(*item), GFP_NOFS);
if (!item)
return -ENOMEM;
if (!item)
return -ENOMEM;