diff options
| author | alc <alc@FreeBSD.org> | 2012-01-16 00:26:49 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2012-01-16 00:26:49 +0000 |
| commit | 213db2103e6330ef8205522e5abb4dc9481c6c3d (patch) | |
| tree | ead83f2a8c9c0d57d631896299abc8a488aa7e10 /sys/fs/tmpfs/tmpfs_vnops.c | |
| parent | 83920bc18511f0c34df0d3888ba7ebe90c39d3d8 (diff) | |
| download | FreeBSD-src-213db2103e6330ef8205522e5abb4dc9481c6c3d.zip FreeBSD-src-213db2103e6330ef8205522e5abb4dc9481c6c3d.tar.gz | |
When tmpfs_write() resets an extended file to its original size after an
error, we want tmpfs_reg_resize() to ignore I/O errors and unconditionally
update the file's size.
Reviewed by: kib
MFC after: 3 weeks
Diffstat (limited to 'sys/fs/tmpfs/tmpfs_vnops.c')
| -rw-r--r-- | sys/fs/tmpfs/tmpfs_vnops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index f0dfe36..3f1482e 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -747,7 +747,8 @@ tmpfs_write(struct vop_write_args *v) extended = uio->uio_offset + uio->uio_resid > node->tn_size; if (extended) { - error = tmpfs_reg_resize(vp, uio->uio_offset + uio->uio_resid); + error = tmpfs_reg_resize(vp, uio->uio_offset + uio->uio_resid, + FALSE); if (error != 0) goto out; } @@ -773,7 +774,7 @@ tmpfs_write(struct vop_write_args *v) } if (error != 0) - (void)tmpfs_reg_resize(vp, oldsize); + (void)tmpfs_reg_resize(vp, oldsize, TRUE); out: MPASS(IMPLIES(error == 0, uio->uio_resid == 0)); |
