aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcao <[email protected]>2016-08-30 19:32:22 +0800
committerBrian Behlendorf <[email protected]>2016-08-30 14:33:40 -0700
commit8f50bafb04658911a1c2a6be3a969b726cc527c4 (patch)
tree217b1bbb2141400f7b31ecbcaed08280c66b1a6c
parentdb707ad094431a8869123cb2389a4b768d5583a0 (diff)
Delete unused zfsctl_snapdir_inactive declaration
zfsctl_snapdir_inactive is defined in zfs-0.6.3. In zfs-0.6.5.7 this is declaration remains even though the implementation was removed in commit 278bee93. Removed fastreboot_disable_highpil which is also unused. Signed-off-by: caoxuewen [email protected] Signed-off-by: Brian Behlendorf <[email protected]> Closes #5042
-rw-r--r--include/sys/zfs_ctldir.h1
-rw-r--r--module/zfs/fm.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/sys/zfs_ctldir.h b/include/sys/zfs_ctldir.h
index 65c44f3cc..26f0122ff 100644
--- a/include/sys/zfs_ctldir.h
+++ b/include/sys/zfs_ctldir.h
@@ -74,7 +74,6 @@ extern int zfsctl_snapdir_remove(struct inode *dip, char *name, cred_t *cr,
int flags);
extern int zfsctl_snapdir_mkdir(struct inode *dip, char *dirname, vattr_t *vap,
struct inode **ipp, cred_t *cr, int flags);
-extern void zfsctl_snapdir_inactive(struct inode *ip);
extern int zfsctl_snapshot_mount(struct path *path, int flags);
extern int zfsctl_snapshot_unmount(char *snapname, int flags);
extern int zfsctl_snapshot_unmount_delay(spa_t *spa, uint64_t objsetid,
diff --git a/module/zfs/fm.c b/module/zfs/fm.c
index d60c296c5..09e7913b9 100644
--- a/module/zfs/fm.c
+++ b/module/zfs/fm.c
@@ -97,7 +97,6 @@ static list_t zevent_list;
static kcondvar_t zevent_cv;
#endif /* _KERNEL */
-extern void fastreboot_disable_highpil(void);
/*
* Common fault management kstats to record event generation failures