diff options
| author | Chunwei Chen <[email protected]> | 2015-12-07 15:43:53 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-12-08 16:38:56 -0800 |
| commit | 24ef51f660b0eb4e1507c440f4bcf0c6b38f31d0 (patch) | |
| tree | c95509615158937a78c05325f489e66703d81381 /include/sys | |
| parent | b58986eebf3c47c946393da4b968ee33edaea99e (diff) | |
Use spa as key besides objsetid for snapentry
objsetid is not unique across pool, so using it solely as key would cause
panic when automounting two snapshot on different pools with the same
objsetid. We fix this by adding spa pointer as additional key.
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Issue #3948
Issue #3786
Issue #3887
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/zfs_ctldir.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sys/zfs_ctldir.h b/include/sys/zfs_ctldir.h index 960a9a629..65c44f3cc 100644 --- a/include/sys/zfs_ctldir.h +++ b/include/sys/zfs_ctldir.h @@ -77,7 +77,8 @@ extern int zfsctl_snapdir_mkdir(struct inode *dip, char *dirname, vattr_t *vap, 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(uint64_t objsetid, int delay); +extern int zfsctl_snapshot_unmount_delay(spa_t *spa, uint64_t objsetid, + int delay); extern int zfsctl_lookup_objset(struct super_block *sb, uint64_t objsetid, zfs_sb_t **zsb); |