Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions module/os/freebsd/zfs/zfs_vnops_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,9 @@ zfs_open(vnode_t **vpp, int flag, cred_t *cr)
* Keep a count of the synchronous opens in the znode. On first
* synchronous open we must convert all previous async transactions
* into sync to keep correct ordering.
* Skip it for snapshot, as it won't have any transactions.
*/
if (flag & O_SYNC) {
if (!zfsvfs->z_issnap && (flag & O_SYNC)) {
if (atomic_inc_32_nv(&zp->z_sync_cnt) == 1)
zil_async_to_sync(zfsvfs->z_log, zp->z_id);
}
Expand All @@ -264,7 +265,7 @@ zfs_close(vnode_t *vp, int flag, int count, offset_t offset, cred_t *cr)
return (error);

/* Decrement the synchronous opens in the znode */
if ((flag & O_SYNC) && (count == 1))
if (!zfsvfs->z_issnap && (flag & O_SYNC) && (count == 1))
atomic_dec_32(&zp->z_sync_cnt);

zfs_exit(zfsvfs, FTAG);
Expand Down
5 changes: 3 additions & 2 deletions module/os/linux/zfs/zfs_vnops_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,9 @@ zfs_open(struct inode *ip, int mode, int flag, cred_t *cr)
* Keep a count of the synchronous opens in the znode. On first
* synchronous open we must convert all previous async transactions
* into sync to keep correct ordering.
* Skip it for snapshot, as it won't have any transactions.
*/
if (flag & O_SYNC) {
if (!zfsvfs->z_issnap && (flag & O_SYNC)) {
if (atomic_inc_32_nv(&zp->z_sync_cnt) == 1)
zil_async_to_sync(zfsvfs->z_log, zp->z_id);
}
Expand All @@ -222,7 +223,7 @@ zfs_close(struct inode *ip, int flag, cred_t *cr)
return (error);

/* Decrement the synchronous opens in the znode */
if (flag & O_SYNC)
if (!zfsvfs->z_issnap && (flag & O_SYNC))
atomic_dec_32(&zp->z_sync_cnt);

zfs_exit(zfsvfs, FTAG);
Expand Down
Loading