by Adrian Bunk

[permalink] [raw]

Subject: [-mm patch] fs/ocfs2/dlm/: make functions static

On Mon, Dec 11, 2006 at 02:26:36PM -0800, Mark Fasheh wrote:
> Hi Adrian,
>
> On Mon, Dec 11, 2006 at 08:10:01PM +0100, Adrian Bunk wrote:
> > On Mon, Dec 11, 2006 at 12:58:07AM -0800, Andrew Morton wrote:
> > >...
> > > Changes since 2.6.19-rc6-mm2:
> > >...
> > > git-ocfs2.patch
> > >...
> > > git trees.
> > >...
> >
> > This patch makes needlessly global code static.
> >
> > Signed-off-by: Adrian Bunk <[email protected]>
>
> I hand-merged the tcp.c change as the patch introducing that variable is
> going upstream soon. Would you mind sending me the dlm/* stuff as a seperate
> patch?

It's below.

> Thanks,
> --Mark

cu
Adrian

<-- snip -->

This patch makes some needlessly global functions static.

Signed-off-by: Adrian Bunk <[email protected]>

---

fs/ocfs2/dlm/dlmcommon.h | 6 ------
fs/ocfs2/dlm/dlmmaster.c | 8 +++++---
fs/ocfs2/dlm/dlmthread.c | 4 ++--
3 files changed, 7 insertions(+), 11 deletions(-)

--- linux-2.6.19-mm1/fs/ocfs2/dlm/dlmcommon.h.old 2006-12-11 18:34:44.000000000 +0100
+++ linux-2.6.19-mm1/fs/ocfs2/dlm/dlmcommon.h 2006-12-11 18:36:22.000000000 +0100
@@ -739,8 +739,6 @@
struct dlm_lock_resource *res);
void dlm_lockres_calc_usage(struct dlm_ctxt *dlm,
struct dlm_lock_resource *res);
-int dlm_purge_lockres(struct dlm_ctxt *dlm,
- struct dlm_lock_resource *lockres);
static inline void dlm_lockres_get(struct dlm_lock_resource *res)
{
/* This is called on every lookup, so it might be worth
@@ -864,10 +862,6 @@
void dlm_hb_node_down_cb(struct o2nm_node *node, int idx, void *data);
void dlm_hb_node_up_cb(struct o2nm_node *node, int idx, void *data);

-int dlm_lockres_is_dirty(struct dlm_ctxt *dlm, struct dlm_lock_resource *res);
-int dlm_migrate_lockres(struct dlm_ctxt *dlm,
- struct dlm_lock_resource *res,
- u8 target);
int dlm_empty_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res);
int dlm_finish_migration(struct dlm_ctxt *dlm,
struct dlm_lock_resource *res,
--- linux-2.6.19-mm1/fs/ocfs2/dlm/dlmmaster.c.old 2006-12-11 18:35:13.000000000 +0100
+++ linux-2.6.19-mm1/fs/ocfs2/dlm/dlmmaster.c 2006-12-11 18:37:28.000000000 +0100
@@ -2327,8 +2327,9 @@
*/

-int dlm_migrate_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
- u8 target)
+static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
+ struct dlm_lock_resource *res,
+ u8 target)
{
struct dlm_master_list_entry *mle = NULL;
struct dlm_master_list_entry *oldmle = NULL;
@@ -2676,7 +2677,8 @@
return can_proceed;
}

-int dlm_lockres_is_dirty(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
+static int dlm_lockres_is_dirty(struct dlm_ctxt *dlm,
+ struct dlm_lock_resource *res)
{
int ret;
spin_lock(&res->spinlock);
--- linux-2.6.19-mm1/fs/ocfs2/dlm/dlmthread.c.old 2006-12-11 18:36:29.000000000 +0100
+++ linux-2.6.19-mm1/fs/ocfs2/dlm/dlmthread.c 2006-12-11 18:36:41.000000000 +0100
@@ -154,7 +154,8 @@
spin_unlock(&dlm->spinlock);
}

-int dlm_purge_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)
+static int dlm_purge_lockres(struct dlm_ctxt *dlm,
+ struct dlm_lock_resource *res)
{
int master;
int ret = 0;

2006-12-14 23:51:23

by Greg KH

[permalink] [raw]

Subject: Re: 2.6.19-mm1: gotemp: memset(..., 0) error

On Wed, Dec 13, 2006 at 02:05:59PM +0100, Adrian Bunk wrote:
> <-- snip -->
>
> ...
> NOT FOR MAINLINE!
>
> This is for the driver tutorial I give. It will not be included in the
> mainline kernel tree ever. Use the ldusb driver that is already there
> instead for this device.
>
> This is only a teaching tool.
> ...
> + pkt = kmalloc(sizeof(*pkt), GFP_ATOMIC);
> + if (!pkt)
> + return -ENOMEM;
> + memset(pkt, sizeof(*pkt), 0x00);
> ...
>
> <-- snip -->
>
>
> Lesson 1:
> Write an USB driver.
>
> Lesson 2:
> Correct the memset() argument order or use kzalloc().

Heh, thanks, I've now fixed that up in my tree.

greg k-h