diff options
| author | pjd <pjd@FreeBSD.org> | 2007-04-23 00:52:07 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2007-04-23 00:52:07 +0000 |
| commit | 2063f013741d3fee2d48a255b6bbec6f1d15d003 (patch) | |
| tree | 54c85efd93c3e6d93de3afcd7ec31f6e802cec59 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c | |
| parent | e06dca92fe6d546958ccf3012b122a74b8fffc9c (diff) | |
| download | FreeBSD-src-2063f013741d3fee2d48a255b6bbec6f1d15d003.zip FreeBSD-src-2063f013741d3fee2d48a255b6bbec6f1d15d003.tar.gz | |
MFp4: Reduce diff against vendor code:
- Move FreeBSD-specific code to zfs_freebsd_*() functions in zfs_vnops.c
and keep original functions as similar to vendor's code as possible.
- Add various includes back, now that we have them.
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c index 06cb95a..dde9ec1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c @@ -37,6 +37,7 @@ #include <sys/zfs_dir.h> #include <sys/zil.h> #include <sys/byteorder.h> +#include <sys/policy.h> #include <sys/stat.h> #include <sys/acl.h> #include <sys/dmu.h> @@ -234,7 +235,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *tx, int txtype, */ if (len > zfs_immediate_write_sz) write_state = WR_INDIRECT; - else if (ioflag & IO_SYNC) + else if (ioflag & FDSYNC) write_state = WR_COPIED; else write_state = WR_NEED_COPY; |
