out:
zfs_dirent_unlock(dl);
+ zfs_inode_update(dzp);
+ zfs_inode_update(zp);
iput(ip);
if (zsb->z_os->os_sync == ZFS_SYNC_ALWAYS)
zil_commit(zilog, 0);
- zfs_inode_update(dzp);
- zfs_inode_update(zp);
ZFS_EXIT(zsb);
return (error);
}
zfs_sb_t *zsb = ITOZSB(ip);
loff_t offset;
loff_t pgoff;
- unsigned int pglen;
+ unsigned int pglen;
+ rl_t *rl;
dmu_tx_t *tx;
caddr_t va;
int err = 0;
int cnt = 0;
int sync;
+ ZFS_ENTER(zsb);
+ ZFS_VERIFY_ZP(zp);
ASSERT(PageLocked(pp));
/* Page is beyond end of file */
if (pgoff >= offset) {
unlock_page(pp);
+ ZFS_EXIT(zsb);
return (0);
}
set_page_writeback(pp);
unlock_page(pp);
+ rl = zfs_range_lock(zp, pgoff, pglen, RL_WRITER);
tx = dmu_tx_create(zsb->z_os);
sync = ((zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) ||
if (err == ERESTART)
dmu_tx_wait(tx);
+ /* Will call all registered commit callbacks */
dmu_tx_abort(tx);
+
+ /*
+ * For the synchronous case the commit callback must be
+ * explicitly called because there is no registered callback.
+ */
+ if (sync)
+ zfs_putpage_commit_cb(pp, ECANCELED);
+
+ zfs_range_unlock(rl);
+ ZFS_EXIT(zsb);
return (err);
}
zfs_log_write(zsb->z_log, tx, TX_WRITE, zp, pgoff, pglen, 0);
dmu_tx_commit(tx);
+ zfs_range_unlock(rl);
ASSERT3S(err, ==, 0);
if (sync) {
zfs_putpage_commit_cb(pp, err);
}
+ ZFS_EXIT(zsb);
return (err);
}