* [2.6 patch] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static
@ 2006-03-31 14:53 Adrian Bunk
2006-04-04 4:28 ` Mark Fasheh
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2006-03-31 14:53 UTC (permalink / raw)
To: mark.fasheh, kurt.hackel; +Cc: ocfs2-devel, linux-kernel
dlm_lockres_master_requery() became global without any external usage.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
fs/ocfs2/dlm/dlmcommon.h | 2 --
fs/ocfs2/dlm/dlmrecovery.c | 8 ++++++--
2 files changed, 6 insertions(+), 4 deletions(-)
--- linux-2.6.16-mm2-full/fs/ocfs2/dlm/dlmcommon.h.old 2006-03-31 15:46:51.000000000 +0200
+++ linux-2.6.16-mm2-full/fs/ocfs2/dlm/dlmcommon.h 2006-03-31 15:46:58.000000000 +0200
@@ -801,8 +801,6 @@
int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data);
int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
u8 nodenum, u8 *real_master);
-int dlm_lockres_master_requery(struct dlm_ctxt *dlm,
- struct dlm_lock_resource *res, u8 *real_master);
int dlm_dispatch_assert_master(struct dlm_ctxt *dlm,
--- linux-2.6.16-mm2-full/fs/ocfs2/dlm/dlmrecovery.c.old 2006-03-31 15:47:07.000000000 +0200
+++ linux-2.6.16-mm2-full/fs/ocfs2/dlm/dlmrecovery.c 2006-03-31 15:47:49.000000000 +0200
@@ -95,6 +95,9 @@
static void dlm_request_all_locks_worker(struct dlm_work_item *item,
void *data);
static void dlm_mig_lockres_worker(struct dlm_work_item *item, void *data);
+static int dlm_lockres_master_requery(struct dlm_ctxt *dlm,
+ struct dlm_lock_resource *res,
+ u8 *real_master);
static u64 dlm_get_next_mig_cookie(void);
@@ -1312,8 +1315,9 @@
-int dlm_lockres_master_requery(struct dlm_ctxt *dlm,
- struct dlm_lock_resource *res, u8 *real_master)
+static int dlm_lockres_master_requery(struct dlm_ctxt *dlm,
+ struct dlm_lock_resource *res,
+ u8 *real_master)
{
struct dlm_node_iter iter;
int nodenum;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [2.6 patch] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static
2006-03-31 14:53 [2.6 patch] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static Adrian Bunk
@ 2006-04-04 4:28 ` Mark Fasheh
0 siblings, 0 replies; 2+ messages in thread
From: Mark Fasheh @ 2006-04-04 4:28 UTC (permalink / raw)
To: Adrian Bunk; +Cc: kurt.hackel, ocfs2-devel, linux-kernel
On Fri, Mar 31, 2006 at 04:53:55PM +0200, Adrian Bunk wrote:
> dlm_lockres_master_requery() became global without any external usage.
Looks good, thanks.
--Mark
--
Mark Fasheh
Senior Software Developer, Oracle
mark.fasheh@oracle.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-04-04 4:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-03-31 14:53 [2.6 patch] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static Adrian Bunk
2006-04-04 4:28 ` Mark Fasheh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox