Re: [Cluster-devel] [PATCH] dlm: remove unnecessary error check

[Guoqing Jiang]

Hi David,

David Teigland wrote:
 On Wed, Jun 10, 2015 at 11:10:44AM +0800, Guoqing Jiang wrote:
   
 The remove_from_waiters could  only be invoked after failed to
 create_message, right?
 Since send_message always returns 0, this patch doesn't touch anything
 about the failure
 path, and it also doesn't change the original semantic.
 

 I'm not inclined to take any patches unless there's a problem identified.

 .  
   
Do you consider take the following clean up? If yes, I will send a
formal patch,
otherwise pls ignore it.

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 35502d4..7c822f7 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -3747,30 +3747,7 @@ static int send_bast(struct dlm_rsb *r, struct
dlm_lkb *lkb, int mode)
 
 static int send_lookup(struct dlm_rsb *r, struct dlm_lkb *lkb)
 {
-   struct dlm_message *ms;
-   struct dlm_mhandle *mh;
-   int to_nodeid, error;
-
-   to_nodeid = dlm_dir_nodeid(r);
-
-   error = add_to_waiters(lkb, DLM_MSG_LOOKUP, to_nodeid);
-   if (error)
-   return error;
-
-   error = create_message(r, NULL, to_nodeid, DLM_MSG_LOOKUP, ms,
mh);
-   if (error)
-   goto fail;
-
-   send_args(r, lkb, ms);
-
-   error = send_message(mh, ms);
-   if (error)
-   goto fail;
-   return 0;
-
- fail:
-   remove_from_waiters(lkb, DLM_MSG_LOOKUP_REPLY);
-   return error;
+   return send_common(r, lkb, DLM_MSG_LOOKUP);
 }

Thanks,
Guoqing

Re: [Cluster-devel] [PATCH] dlm: remove unnecessary error check

[David Teigland]

On Thu, Jun 11, 2015 at 05:47:28PM +0800, Guoqing Jiang wrote:
 Do you consider take the following clean up? If yes, I will send a
 formal patch, otherwise pls ignore it.

On first glance, the old and new code do not appear to do the same thing,
so let's leave it as it is.

 -   to_nodeid = dlm_dir_nodeid(r);