git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'zpool create' segfault due to bad syntax
[zfs.git]
/
module
/
zfs
/
zfs_vnops.c
diff --git
a/module/zfs/zfs_vnops.c
b/module/zfs/zfs_vnops.c
index
2da5fec
..
5765c9a
100644
(file)
--- a/
module/zfs/zfs_vnops.c
+++ b/
module/zfs/zfs_vnops.c
@@
-868,7
+868,7
@@
iput_async(struct inode *ip, taskq_t *taskq)
{
ASSERT(atomic_read(&ip->i_count) > 0);
if (atomic_read(&ip->i_count) == 1)
{
ASSERT(atomic_read(&ip->i_count) > 0);
if (atomic_read(&ip->i_count) == 1)
- taskq_dispatch(taskq, (task_func_t *)iput, ip, TQ_
SLEEP
);
+ taskq_dispatch(taskq, (task_func_t *)iput, ip, TQ_
PUSHPAGE
);
else
iput(ip);
}
else
iput(ip);
}
@@
-934,7
+934,7
@@
zfs_get_data(void *arg, lr_write_t *lr, char *buf, zio_t *zio)
return (ENOENT);
}
return (ENOENT);
}
- zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_
SLEEP
);
+ zgd = (zgd_t *)kmem_zalloc(sizeof (zgd_t), KM_
PUSHPAGE
);
zgd->zgd_zilog = zsb->z_log;
zgd->zgd_private = zp;
zgd->zgd_zilog = zsb->z_log;
zgd->zgd_private = zp;
@@
-1900,13
+1900,13
@@
top:
out:
zfs_dirent_unlock(dl);
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);
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_EXIT(zsb);
return (error);
}
@@
-3790,14
+3790,18
@@
zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
zfs_sb_t *zsb = ITOZSB(ip);
loff_t offset;
loff_t pgoff;
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;
uint64_t mtime[2], ctime[2];
sa_bulk_attr_t bulk[3];
int cnt = 0;
dmu_tx_t *tx;
caddr_t va;
int err = 0;
uint64_t mtime[2], ctime[2];
sa_bulk_attr_t bulk[3];
int cnt = 0;
+ int sync;
+ ZFS_ENTER(zsb);
+ ZFS_VERIFY_ZP(zp);
ASSERT(PageLocked(pp));
ASSERT(PageLocked(pp));
@@
-3809,6
+3813,7
@@
zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
/* Page is beyond end of file */
if (pgoff >= offset) {
unlock_page(pp);
/* Page is beyond end of file */
if (pgoff >= offset) {
unlock_page(pp);
+ ZFS_EXIT(zsb);
return (0);
}
return (0);
}
@@
-3831,9
+3836,13
@@
zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
set_page_writeback(pp);
unlock_page(pp);
set_page_writeback(pp);
unlock_page(pp);
+ rl = zfs_range_lock(zp, pgoff, pglen, RL_WRITER);
tx = dmu_tx_create(zsb->z_os);
tx = dmu_tx_create(zsb->z_os);
- dmu_tx_callback_register(tx, zfs_putpage_commit_cb, pp);
+ sync = ((zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) ||
+ (wbc->sync_mode == WB_SYNC_ALL));
+ if (!sync)
+ dmu_tx_callback_register(tx, zfs_putpage_commit_cb, pp);
dmu_tx_hold_write(tx, zp->z_id, pgoff, pglen);
dmu_tx_hold_write(tx, zp->z_id, pgoff, pglen);
@@
-3844,7
+3853,18
@@
zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
if (err == ERESTART)
dmu_tx_wait(tx);
if (err == ERESTART)
dmu_tx_wait(tx);
+ /* Will call all registered commit callbacks */
dmu_tx_abort(tx);
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);
}
return (err);
}
@@
-3860,12
+3880,15
@@
zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
zfs_log_write(zsb->z_log, tx, TX_WRITE, zp, pgoff, pglen, 0);
dmu_tx_commit(tx);
zfs_log_write(zsb->z_log, tx, TX_WRITE, zp, pgoff, pglen, 0);
dmu_tx_commit(tx);
+ zfs_range_unlock(rl);
ASSERT3S(err, ==, 0);
ASSERT3S(err, ==, 0);
- if ((zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) ||
- (wbc->sync_mode == WB_SYNC_ALL))
+ if (sync) {
zil_commit(zsb->z_log, zp->z_id);
zil_commit(zsb->z_log, zp->z_id);
+ zfs_putpage_commit_cb(pp, err);
+ }
+ ZFS_EXIT(zsb);
return (err);
}
return (err);
}