Joseph Qi
2013-May-22 15:50 UTC
[Ocfs2-devel] [PATCH] ret should be int instead of enum in dlm_request_all_locks
In dlm_request_all_locks, ret is type enum. But o2net_send_message
returns a type int value. Then it will never run into the following
error branch. So we should change the ret type from enum to int.
Signed-off-by: Joseph Qi <joseph.qi at huawei.com>
---
fs/ocfs2/dlm/dlmrecovery.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c
index 060af11..a83e378 100644
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
@@ -786,7 +786,7 @@ static int dlm_request_all_locks(struct dlm_ctxt
*dlm, u8 request_from,
u8 dead_node)
{
struct dlm_lock_request lr;
- enum dlm_status ret;
+ int ret;
mlog(0, "\n");
@@ -799,7 +799,6 @@ static int dlm_request_all_locks(struct dlm_ctxt
*dlm, u8 request_from,
lr.dead_node = dead_node;
// send message
- ret = DLM_NOLOCKMGR;
ret = o2net_send_message(DLM_LOCK_REQUEST_MSG, dlm->key,
&lr, sizeof(lr), request_from, NULL);
--
1.7.9.7
Sunil Mushran
2013-May-22 22:41 UTC
[Ocfs2-devel] [PATCH] ret should be int instead of enum in dlm_request_all_locks
Acked-by: Sunil Mushran <sunil.mushran at gmail.com> On Wed, May 22, 2013 at 8:50 AM, Joseph Qi <joseph.qi at huawei.com> wrote:> In dlm_request_all_locks, ret is type enum. But o2net_send_message > returns a type int value. Then it will never run into the following > error branch. So we should change the ret type from enum to int. > > Signed-off-by: Joseph Qi <joseph.qi at huawei.com> > > --- > fs/ocfs2/dlm/dlmrecovery.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c > index 060af11..a83e378 100644 > --- a/fs/ocfs2/dlm/dlmrecovery.c > +++ b/fs/ocfs2/dlm/dlmrecovery.c > @@ -786,7 +786,7 @@ static int dlm_request_all_locks(struct dlm_ctxt > *dlm, u8 request_from, > u8 dead_node) > { > struct dlm_lock_request lr; > - enum dlm_status ret; > + int ret; > > mlog(0, "\n"); > > @@ -799,7 +799,6 @@ static int dlm_request_all_locks(struct dlm_ctxt > *dlm, u8 request_from, > lr.dead_node = dead_node; > > // send message > - ret = DLM_NOLOCKMGR; > ret = o2net_send_message(DLM_LOCK_REQUEST_MSG, dlm->key, > &lr, sizeof(lr), request_from, NULL); > > -- > 1.7.9.7 > > > _______________________________________________ > Ocfs2-devel mailing list > Ocfs2-devel at oss.oracle.com > https://oss.oracle.com/mailman/listinfo/ocfs2-devel >-------------- next part -------------- An HTML attachment was scrubbed... URL: http://oss.oracle.com/pipermail/ocfs2-devel/attachments/20130522/6e771252/attachment.html