From: Joe Thornber <thornber@sistina.com>
To: Joe Thornber <thornber@sistina.com>
Cc: Linus Torvalds <torvalds@osdl.org>,
Andrew Morton <akpm@zip.com.au>,
Linux Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [Patch 7/6 (so I can't count)] dm: resume() name clash
Date: Thu, 31 Jul 2003 11:57:28 +0100 [thread overview]
Message-ID: <20030731105728.GK394@fib011235813.fsnet.co.uk> (raw)
In-Reply-To: <20030731104517.GD394@fib011235813.fsnet.co.uk>
Some architectures define an extern function called resume(), which
clashes with a static function in dm-ioctl-v4.c. Rename static one to
do_resume().
--- diff/drivers/md/dm-ioctl-v4.c 2003-07-31 11:55:02.000000000 +0100
+++ source/drivers/md/dm-ioctl-v4.c 2003-07-31 11:53:51.000000000 +0100
@@ -594,7 +594,7 @@
return dm_hash_rename(param->name, new_name);
}
-static int suspend(struct dm_ioctl *param)
+static int do_suspend(struct dm_ioctl *param)
{
int r = 0;
struct mapped_device *md;
@@ -613,7 +613,7 @@
return r;
}
-static int resume(struct dm_ioctl *param)
+static int do_resume(struct dm_ioctl *param)
{
int r = 0;
struct hash_cell *hc;
@@ -676,9 +676,9 @@
static int dev_suspend(struct dm_ioctl *param, size_t param_size)
{
if (param->flags & DM_SUSPEND_FLAG)
- return suspend(param);
+ return do_suspend(param);
- return resume(param);
+ return do_resume(param);
}
/*
prev parent reply other threads:[~2003-07-31 10:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-07-31 10:45 2.6.0-test2 device mapper patchset Joe Thornber
2003-07-31 10:48 ` [Patch 1/6] dm: don't use MODULE_PARM Joe Thornber
2003-07-31 10:49 ` [Patch 2/6] dm: remove blk.h include Joe Thornber
2003-07-31 10:49 ` [Patch 3/6] dm: decimal device num sscanf Joe Thornber
2003-07-31 15:04 ` Christoph Hellwig
2003-07-31 15:13 ` Joe Thornber
2003-07-31 15:20 ` Christoph Hellwig
2003-07-31 15:24 ` Joe Thornber
2003-07-31 16:14 ` Christoph Hellwig
2003-07-31 16:27 ` Joe Thornber
2003-08-02 16:54 ` Christoph Hellwig
2003-07-31 16:13 ` Christophe Saout
2003-07-31 10:50 ` [Patch 4/6] dm: 64 bit ioctl fixes Joe Thornber
2003-07-31 10:51 ` [Patch 5/6] dm: missing #include Joe Thornber
2003-07-31 10:51 ` [Patch 6/6] dm: use sector_div() Joe Thornber
2003-07-31 10:57 ` Joe Thornber [this message]
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=20030731105728.GK394@fib011235813.fsnet.co.uk \
--to=thornber@sistina.com \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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;
as well as URLs for NNTP newsgroup(s).