diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 10:30:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 10:30:10 -0700 |
| commit | b7e6f62fe259187f2578d00960ef1b0e6ff6afd5 (patch) | |
| tree | 796fd3c878a2f8d8d55ea1e52ef236742a48c3dd /drivers/md/dm-log.c | |
| parent | 8a392625b665c676a77c62f8608d10ff430bcb83 (diff) | |
| parent | d41e26b901111f4e540aa2c27ec7a1681c782be9 (diff) | |
| download | linux-b7e6f62fe259187f2578d00960ef1b0e6ff6afd5.tar.gz linux-b7e6f62fe259187f2578d00960ef1b0e6ff6afd5.tar.bz2 linux-b7e6f62fe259187f2578d00960ef1b0e6ff6afd5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
dm crypt: add merge
dm table: remove merge_bvec sector restriction
dm: linear add merge
dm: introduce merge_bvec_fn
dm snapshot: use per device mempools
dm snapshot: fix race during exception creation
dm snapshot: track snapshot reads
dm mpath: fix test for reinstate_path
dm mpath: return parameter error
dm io: remove struct padding
dm log: make dm_dirty_log init and exit static
dm mpath: free path selector on invalid args
Diffstat (limited to 'drivers/md/dm-log.c')
| -rw-r--r-- | drivers/md/dm-log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c index 67a6f31b7fc3..5b48478c79f5 100644 --- a/drivers/md/dm-log.c +++ b/drivers/md/dm-log.c @@ -831,7 +831,7 @@ static struct dm_dirty_log_type _disk_type = { .status = disk_status, }; -int __init dm_dirty_log_init(void) +static int __init dm_dirty_log_init(void) { int r; @@ -848,7 +848,7 @@ int __init dm_dirty_log_init(void) return r; } -void __exit dm_dirty_log_exit(void) +static void __exit dm_dirty_log_exit(void) { dm_dirty_log_type_unregister(&_disk_type); dm_dirty_log_type_unregister(&_core_type); |