Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

linux: reject syncing ops if the filesystem is unmounting 

The kernel can call these during unmount, so we have to handle them
directly to prevent any further IO being issued.

zfs_fsync reorganised slightly to not set up zfs_fsyncer_key until after
the teardown lock is acquired, just in case we don't get it.

Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
(cherry picked from commit 900c26570ddcdd1d3ca135e6aee5df6456f6bfd6)
This commit is contained in:
Rob Norris 2023-05-04 22:11:20 +10:00 committed by Geoff Amey
parent 7e4a9cbaee
commit 3aea149bf8
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/os/linux/zfs/zfs_vfsops.c
View File

@ -275,7 +275,8 @@ zfs_sync(struct super_block *sb, int wait, cred_t *cr)
*/ */
dsl_pool_t *dp; dsl_pool_t *dp;
ZFS_ENTER(zfsvfs); ZFS_ENTER_UNMOUNTOK(zfsvfs);
dp = dmu_objset_pool(zfsvfs->z_os); dp = dmu_objset_pool(zfsvfs->z_os);
/* /*

2
module/os/linux/zfs/zfs_vnops_os.c
View File

@ -3665,7 +3665,7 @@ zfs_dirty_inode(struct inode *ip, int flags)
if (zfs_is_readonly(zfsvfs) || dmu_objset_is_snapshot(zfsvfs->z_os)) if (zfs_is_readonly(zfsvfs) || dmu_objset_is_snapshot(zfsvfs->z_os))
return (0); return (0);
ZFS_ENTER(zfsvfs); ZFS_ENTER_UNMOUNTOK(zfsvfs);
ZFS_VERIFY_ZP(zp); ZFS_VERIFY_ZP(zp);
#ifdef I_DIRTY_TIME #ifdef I_DIRTY_TIME

14
module/zfs/zfs_vnops.c
View File

@ -63,16 +63,20 @@ zfs_fsync(znode_t *zp, int syncflag, cred_t *cr)
{ {
zfsvfs_t *zfsvfs = ZTOZSB(zp); zfsvfs_t *zfsvfs = ZTOZSB(zp);
if (zfsvfs->z_os->os_sync == ZFS_SYNC_DISABLED)
return (0);
ZFS_ENTER_UNMOUNTOK(zfsvfs);
ZFS_VERIFY_ZP(zp);
(void) tsd_set(zfs_fsyncer_key, (void *)zfs_fsync_sync_cnt); (void) tsd_set(zfs_fsyncer_key, (void *)zfs_fsync_sync_cnt);
if (zfsvfs->z_os->os_sync != ZFS_SYNC_DISABLED) {
ZFS_ENTER(zfsvfs);
ZFS_VERIFY_ZP(zp);
zil_commit(zfsvfs->z_log, zp->z_id); zil_commit(zfsvfs->z_log, zp->z_id);
ZFS_EXIT(zfsvfs);
}
tsd_set(zfs_fsyncer_key, NULL); tsd_set(zfs_fsyncer_key, NULL);
ZFS_EXIT(zfsvfs);
return (0); return (0);
} }