From 8f50bafb04658911a1c2a6be3a969b726cc527c4 Mon Sep 17 00:00:00 2001 From: cao Date: Tue, 30 Aug 2016 19:32:22 +0800 Subject: [PATCH] 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 cao.xuewen@zte.com.cn Signed-off-by: Brian Behlendorf Closes #5042 --- include/sys/zfs_ctldir.h | 1 - module/zfs/fm.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/sys/zfs_ctldir.h b/include/sys/zfs_ctldir.h index 65c44f3cca54..26f0122ff7eb 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 d60c296c5d16..09e7913b9d04 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