From: Adrian Bunk <bunk@stusta.de>
To: mark.fasheh@oracle.com, kurt.hackel@oracle.com
Cc: ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org
Subject: [2.6 patch] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static
Date: Fri, 31 Mar 2006 16:53:55 +0200 [thread overview]
Message-ID: <20060331145355.GF3893@stusta.de> (raw)
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;
next reply other threads:[~2006-03-31 14:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-31 14:53 Adrian Bunk [this message]
2006-04-04 4:28 ` [2.6 patch] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static Mark Fasheh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060331145355.GF3893@stusta.de \
--to=bunk@stusta.de \
--cc=kurt.hackel@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.fasheh@oracle.com \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox