mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
Make zfs_replay.c work on FreeBSD
FreeBSD's vfs currently doesn't permit file systems to do their own locking. To avoid having to have duplicate zfs functions with and without locking add locking here. With luck these changes can be removed in the future. Reviewed-by: Sean Eric Fagan <sef@ixsystems.com> Reviewed-by: Jorgen Lundman <lundman@lundman.net> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Matt Macy <mmacy@FreeBSD.org> Closes #9715
This commit is contained in:
committed by
Brian Behlendorf
parent
9bb0d89c5c
commit
13a9a6f5e8
@@ -973,6 +973,42 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr)
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write the bytes to a file.
|
||||
*
|
||||
* IN: zp - znode of file to be written to
|
||||
* data - bytes to write
|
||||
* len - number of bytes to write
|
||||
* pos - offset to start writing at
|
||||
*
|
||||
* OUT: resid - remaining bytes to write
|
||||
*
|
||||
* RETURN: 0 if success
|
||||
* positive error code if failure
|
||||
*
|
||||
* Timestamps:
|
||||
* zp - ctime|mtime updated if byte count > 0
|
||||
*/
|
||||
int
|
||||
zfs_write_simple(znode_t *zp, const void *data, size_t len,
|
||||
loff_t pos, size_t *resid)
|
||||
{
|
||||
ssize_t written;
|
||||
int error = 0;
|
||||
|
||||
written = zpl_write_common(ZTOI(zp), data, len, &pos,
|
||||
UIO_SYSSPACE, 0, kcred);
|
||||
if (written < 0) {
|
||||
error = -written;
|
||||
} else if (resid == NULL) {
|
||||
if (written < len)
|
||||
error = SET_ERROR(EIO); /* short write */
|
||||
} else {
|
||||
*resid = len - written;
|
||||
}
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Drop a reference on the passed inode asynchronously. This ensures
|
||||
* that the caller will never drop the last reference on an inode in
|
||||
|
||||
@@ -320,6 +320,12 @@ zfs_znode_hold_exit(zfsvfs_t *zfsvfs, znode_hold_t *zh)
|
||||
kmem_cache_free(znode_hold_cache, zh);
|
||||
}
|
||||
|
||||
dev_t
|
||||
zfs_cmpldev(uint64_t dev)
|
||||
{
|
||||
return (dev);
|
||||
}
|
||||
|
||||
static void
|
||||
zfs_znode_sa_init(zfsvfs_t *zfsvfs, znode_t *zp,
|
||||
dmu_buf_t *db, dmu_object_type_t obj_type, sa_handle_t *sa_hdl)
|
||||
|
||||
Reference in New Issue
Block a user