diff options
| author | Brian Behlendorf <[email protected]> | 2009-02-18 12:51:31 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-02-18 12:51:31 -0800 |
| commit | d164b2093561a9771db07346e6fffc9ca19427a2 (patch) | |
| tree | b24adaf8695cebdd827968ac1df3cc0093936be1 /module/zfs/zvol.c | |
| parent | c65e71073f45e6e549c825969740cb15a96ea547 (diff) | |
Rebase master to b108
Diffstat (limited to 'module/zfs/zvol.c')
| -rw-r--r-- | module/zfs/zvol.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 0206dad9e..d3be8fb50 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1324,6 +1324,8 @@ zvol_write(dev_t dev, uio_t *uio, cred_t *cr) break; } zfs_range_unlock(rl); + if (!zil_disable) + zil_commit(zv->zv_zilog, UINT64_MAX, ZVOL_OBJ); return (error); } |