Author: avg
Date: Tue Feb 27 14:08:54 2018
New Revision: 330057
URL: https://svnweb.freebsd.org/changeset/base/330057
Log:
add ZFS_ENTER protection to .zfs/snapshot vnode operations that need it
Those operations, zfsctl_snapdir_readdir and zfsctl_snapdir_getattr,
access the filesystem's objset and it can be unstable during operations
like receive and rollback.
MFC after: 2 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Tue Feb
27 12:53:25 2018 (r330056)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c Tue Feb
27 14:08:54 2018 (r330057)
@@ -1071,6 +1071,7 @@ zfsctl_snapdir_readdir(ap)
return (error);
}
+ ZFS_ENTER(zfsvfs);
for (;;) {
uint64_t cookie;
uint64_t id;
@@ -1087,6 +1088,7 @@ zfsctl_snapdir_readdir(ap)
*eofp = 1;
error = 0;
}
+ ZFS_EXIT(zfsvfs);
return (error);
}
@@ -1099,6 +1101,7 @@ zfsctl_snapdir_readdir(ap)
if (error != 0) {
if (error == ENAMETOOLONG)
error = 0;
+ ZFS_EXIT(zfsvfs);
return (SET_ERROR(error));
}
uio->uio_offset = cookie + dots_offset;
@@ -1122,6 +1125,7 @@ zfsctl_snapdir_getattr(ap)
uint64_t snap_count;
int err;
+ ZFS_ENTER(zfsvfs);
zfsctl_common_getattr(vp, vap);
vap->va_ctime = dmu_objset_snap_cmtime(zfsvfs->z_os);
vap->va_mtime = vap->va_ctime;
@@ -1129,12 +1133,15 @@ zfsctl_snapdir_getattr(ap)
if (dsl_dataset_phys(ds)->ds_snapnames_zapobj != 0) {
err = zap_count(dmu_objset_pool(ds->ds_objset)->dp_meta_objset,
dsl_dataset_phys(ds)->ds_snapnames_zapobj, &snap_count);
- if (err != 0)
+ if (err != 0) {
+ ZFS_EXIT(zfsvfs);
return (err);
+ }
vap->va_nlink += snap_count;
}
vap->va_size = vap->va_nlink;
+ ZFS_EXIT(zfsvfs);
return (0);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
