[Ocfs2-commits] smushran commits r1937 - in trunk/fs/ocfs2: .
cluster dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Mar 3 20:08:56 CST 2005
Author: smushran
Signed-off-by: khackel
Signed-off-by: mfasheh
Date: 2005-03-03 20:08:55 -0600 (Thu, 03 Mar 2005)
New Revision: 1937
Modified:
trunk/fs/ocfs2/Cscope.make
trunk/fs/ocfs2/cluster/tcp.c
trunk/fs/ocfs2/dlm/userdlm.c
Log:
one additional put removed in net_register_handler
PREPARE_WORK ==> INIT_WORK in userdlm.c
Signed-off-by: khackel
Signed-off-by: mfasheh
Modified: trunk/fs/ocfs2/Cscope.make
===================================================================
--- trunk/fs/ocfs2/Cscope.make 2005-03-03 02:15:58 UTC (rev 1936)
+++ trunk/fs/ocfs2/Cscope.make 2005-03-04 02:08:55 UTC (rev 1937)
@@ -1,6 +1,6 @@
-CSCOPEFILES=*.c
+CSCOPEFILES=*.c *.h
CSCOPEFILES+=$(KERNELINC)/../fs/*.c $(KERNELINC)/../fs/jbd/*.c
-CSCOPEFILES+=cluster/*.c dlm/*.c
+CSCOPEFILES+=cluster/*.c dlm/*.c cluster/*.h dlm/*.h
cscope:
rm -f cscope.*
Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c 2005-03-03 02:15:58 UTC (rev 1936)
+++ trunk/fs/ocfs2/cluster/tcp.c 2005-03-04 02:08:55 UTC (rev 1937)
@@ -435,7 +435,7 @@
int net_register_handler(u32 msg_type, u32 key, int flags, u32 max_len,
net_msg_handler_func *func, void *data)
{
- net_msg_handler *nmh, *found=NULL;
+ net_msg_handler *nmh;
int ret;
if (max_len > NET_MAX_PAYLOAD_BYTES) {
@@ -473,7 +473,6 @@
ret = net_add_handler(nmh);
if (ret) {
- net_put_handler(found);
netprintk("message handler for type %u, key %u already exists!!!\n",
msg_type, key);
}
Modified: trunk/fs/ocfs2/dlm/userdlm.c
===================================================================
--- trunk/fs/ocfs2/dlm/userdlm.c 2005-03-03 02:15:58 UTC (rev 1936)
+++ trunk/fs/ocfs2/dlm/userdlm.c 2005-03-04 02:08:55 UTC (rev 1937)
@@ -170,9 +170,8 @@
if (!(lockres->l_flags & USER_LOCK_QUEUED)) {
user_dlm_grab_inode_ref(lockres);
- PREPARE_WORK(&lockres->l_work,
- user_dlm_unblock_lock,
- lockres);
+ INIT_WORK(&lockres->l_work, user_dlm_unblock_lock,
+ lockres);
queue_work(user_dlm_worker, &lockres->l_work);
lockres->l_flags |= USER_LOCK_QUEUED;
More information about the Ocfs2-commits
mailing list