summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorRashika Kheria <rashika.kheria@gmail.com>2013-12-19 10:45:02 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2014-02-17 16:19:38 +0100
commited54482b996d16159f3b2f6c03634d340a74dade (patch)
tree782f12e7a2d10b0105972ac58406b6faab0eba5a /drivers/block
parentdrivers: block: Mark function as static in drbd_actlog.c (diff)
downloadlinux-ed54482b996d16159f3b2f6c03634d340a74dade.tar.xz
linux-ed54482b996d16159f3b2f6c03634d340a74dade.zip
drivers: block: Move prototype declaration of function tl_abort_disk_io() to appropriate header file from drbd_state.c
Move the prototype declaration of function tl_abort_disk_io() from drbd/drbd_state.c to appropriate header file drbd/drbd_int.h because it is used by more than 2 files. This eliminates the following warnings in drbd/drbd_main.c: drivers/block/drbd/drbd_main.c:310:6: warning: no previous prototype for ‘tl_abort_disk_io’ [-Wmissing-prototypes] Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_int.h1
-rw-r--r--drivers/block/drbd/drbd_state.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 0e06f0c5dd1e..66239fa34f12 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -65,6 +65,7 @@
extern unsigned int minor_count;
extern bool disable_sendpage;
extern bool allow_oos;
+void tl_abort_disk_io(struct drbd_conf *mdev);
#ifdef CONFIG_DRBD_FAULT_INJECTION
extern int enable_faults;
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 216d47b7e88b..120e1c0ea6ac 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -29,9 +29,6 @@
#include "drbd_int.h"
#include "drbd_req.h"
-/* in drbd_main.c */
-extern void tl_abort_disk_io(struct drbd_conf *mdev);
-
struct after_state_chg_work {
struct drbd_work w;
union drbd_state os;