diff options
| author | Brian Behlendorf <[email protected]> | 2009-01-15 13:59:39 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-01-15 13:59:39 -0800 |
| commit | fb5f0bc83330c8a0236c4d34a23723ac1974971a (patch) | |
| tree | 51880dcfa8ec9e8e80b8c44e9ffc55a4b7160216 /module/zfs/zfs_acl.c | |
| parent | 42bcb36c8987b0b11411ce6cf8339694b624a17c (diff) | |
Rebase master to b105
Diffstat (limited to 'module/zfs/zfs_acl.c')
| -rw-r--r-- | module/zfs/zfs_acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/zfs_acl.c b/module/zfs/zfs_acl.c index 341dc4dfe..fdf92a156 100644 --- a/module/zfs/zfs_acl.c +++ b/module/zfs/zfs_acl.c @@ -2148,12 +2148,12 @@ top: } } - error = dmu_tx_assign(tx, zfsvfs->z_assign); + error = dmu_tx_assign(tx, TXG_NOWAIT); if (error) { mutex_exit(&zp->z_acl_lock); mutex_exit(&zp->z_lock); - if (error == ERESTART && zfsvfs->z_assign == TXG_NOWAIT) { + if (error == ERESTART) { dmu_tx_wait(tx); dmu_tx_abort(tx); goto top; @@ -2208,7 +2208,7 @@ zfs_zaccess_common(znode_t *zp, uint32_t v4_mode, uint32_t *working_mode, *check_privs = B_TRUE; - if (zfsvfs->z_assign >= TXG_INITIAL) { /* ZIL replay */ + if (zfsvfs->z_replay) { *working_mode = 0; return (0); } |