Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "allocating allocated segment" panic #1075

Closed
wants to merge 1 commit into from
Closed

Fix "allocating allocated segment" panic #1075

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion module/zfs/zfs_vnops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3790,7 +3790,8 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
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;
Expand All @@ -3799,6 +3800,8 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
int cnt = 0;
int sync;

ZFS_ENTER(zsb);
ZFS_VERIFY_ZP(zp);

ASSERT(PageLocked(pp));

Expand All @@ -3810,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);
ZFS_EXIT(zsb);
return (0);
}

Expand All @@ -3832,6 +3836,7 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
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) ||
Expand All @@ -3858,6 +3863,8 @@ zfs_putpage(struct inode *ip, struct page *pp, struct writeback_control *wbc)
if (sync)
zfs_putpage_commit_cb(pp, ECANCELED);

zfs_range_unlock(rl);
ZFS_EXIT(zsb);
return (err);
}

Expand All @@ -3873,13 +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_range_unlock(rl);
ASSERT3S(err, ==, 0);

if (sync) {
zil_commit(zsb->z_log, zp->z_id);
zfs_putpage_commit_cb(pp, err);
}

ZFS_EXIT(zsb);
return (err);
}

Expand Down