Commit 9b111f76 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] dm: resume() name clash

From: Joe Thornber <thornber@sistina.com>

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().
parent d2571b1f
...@@ -594,7 +594,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size) ...@@ -594,7 +594,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
return dm_hash_rename(param->name, new_name); 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; int r = 0;
struct mapped_device *md; struct mapped_device *md;
...@@ -613,7 +613,7 @@ static int suspend(struct dm_ioctl *param) ...@@ -613,7 +613,7 @@ static int suspend(struct dm_ioctl *param)
return r; return r;
} }
static int resume(struct dm_ioctl *param) static int do_resume(struct dm_ioctl *param)
{ {
int r = 0; int r = 0;
struct hash_cell *hc; struct hash_cell *hc;
...@@ -676,9 +676,9 @@ static int resume(struct dm_ioctl *param) ...@@ -676,9 +676,9 @@ static int resume(struct dm_ioctl *param)
static int dev_suspend(struct dm_ioctl *param, size_t param_size) static int dev_suspend(struct dm_ioctl *param, size_t param_size)
{ {
if (param->flags & DM_SUSPEND_FLAG) if (param->flags & DM_SUSPEND_FLAG)
return suspend(param); return do_suspend(param);
return resume(param); return do_resume(param);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment