X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=module%2Fzfs%2Fzfs_replay.c;h=813250c37dc4dd2ac03c5bca21bd4e219790fddb;hb=refs%2Fheads%2Frertzinger%2Ffeature-zpool-get--p;hp=a5018ee608e29ff3934cd09e4a0fd88e14f0d7b2;hpb=5484965ab650a56871a62a3373859a7a36ddafcb;p=zfs.git

diff --git a/module/zfs/zfs_replay.c b/module/zfs/zfs_replay.c
index a5018ee..813250c 100644
--- a/module/zfs/zfs_replay.c
+++ b/module/zfs/zfs_replay.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 Cyril Plisko. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -303,7 +304,7 @@ zfs_replay_create_acl(zfs_sb_t *zsb, lr_acl_create_t *lracl, boolean_t byteswap)
 		return (error);
 
 	xva_init(&xva);
-	zfs_init_vattr(&xva.xva_vattr, AT_MODE | AT_UID | AT_GID,
+	zfs_init_vattr(&xva.xva_vattr, ATTR_MODE | ATTR_UID | ATTR_GID,
 	    lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, lr->lr_foid);
 
 	/*
@@ -430,7 +431,7 @@ zfs_replay_create(zfs_sb_t *zsb, lr_create_t *lr, boolean_t byteswap)
 		return (error);
 
 	xva_init(&xva);
-	zfs_init_vattr(&xva.xva_vattr, AT_MODE | AT_UID | AT_GID,
+	zfs_init_vattr(&xva.xva_vattr, ATTR_MODE | ATTR_UID | ATTR_GID,
 	    lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, lr->lr_foid);
 
 	/*
@@ -626,7 +627,7 @@ zfs_replay_write(zfs_sb_t *zsb, lr_write_t *lr, boolean_t byteswap)
 {
 	char *data = (char *)(lr + 1);	/* data follows lr_write_t */
 	znode_t	*zp;
-	int error;
+	int error, written;
 	uint64_t eod, offset, length;
 
 	if (byteswap)
@@ -671,14 +672,12 @@ zfs_replay_write(zfs_sb_t *zsb, lr_write_t *lr, boolean_t byteswap)
 			zsb->z_replay_eof = eod;
 	}
 
-	error = zpl_write_common(ZTOI(zp), data, length, offset,
+	written = zpl_write_common(ZTOI(zp), data, length, offset,
 	    UIO_SYSSPACE, 0, kcred);
-	if (error) {
-		if (error < 0)
-			error = -error;
-		else
-			error = EIO; /* Short write */
-	}
+	if (written < 0)
+		error = -written;
+	else if (written < length)
+		error = EIO; /* short write */
 
 	iput(ZTOI(zp));
 	zsb->z_replay_eof = 0;	/* safety */
@@ -911,26 +910,26 @@ zfs_replay_acl(zfs_sb_t *zsb, lr_acl_t *lr, boolean_t byteswap)
 /*
  * Callback vectors for replaying records
  */
-zil_replay_func_t *zfs_replay_vector[TX_MAX_TYPE] = {
-	(zil_replay_func_t *)zfs_replay_error,		/* no such type */
-	(zil_replay_func_t *)zfs_replay_create,		/* TX_CREATE */
-	(zil_replay_func_t *)zfs_replay_create,		/* TX_MKDIR */
-	(zil_replay_func_t *)zfs_replay_create,		/* TX_MKXATTR */
-	(zil_replay_func_t *)zfs_replay_create,		/* TX_SYMLINK */
-	(zil_replay_func_t *)zfs_replay_remove,		/* TX_REMOVE */
-	(zil_replay_func_t *)zfs_replay_remove,		/* TX_RMDIR */
-	(zil_replay_func_t *)zfs_replay_link,		/* TX_LINK */
-	(zil_replay_func_t *)zfs_replay_rename,		/* TX_RENAME */
-	(zil_replay_func_t *)zfs_replay_write,		/* TX_WRITE */
-	(zil_replay_func_t *)zfs_replay_truncate,	/* TX_TRUNCATE */
-	(zil_replay_func_t *)zfs_replay_setattr,	/* TX_SETATTR */
-	(zil_replay_func_t *)zfs_replay_acl_v0,		/* TX_ACL_V0 */
-	(zil_replay_func_t *)zfs_replay_acl,		/* TX_ACL */
-	(zil_replay_func_t *)zfs_replay_create_acl,	/* TX_CREATE_ACL */
-	(zil_replay_func_t *)zfs_replay_create,		/* TX_CREATE_ATTR */
-	(zil_replay_func_t *)zfs_replay_create_acl,	/* TX_CREATE_ACL_ATTR */
-	(zil_replay_func_t *)zfs_replay_create_acl,	/* TX_MKDIR_ACL */
-	(zil_replay_func_t *)zfs_replay_create,		/* TX_MKDIR_ATTR */
-	(zil_replay_func_t *)zfs_replay_create_acl,	/* TX_MKDIR_ACL_ATTR */
-	(zil_replay_func_t *)zfs_replay_write2,		/* TX_WRITE2 */
+zil_replay_func_t zfs_replay_vector[TX_MAX_TYPE] = {
+	(zil_replay_func_t)zfs_replay_error,		/* no such type */
+	(zil_replay_func_t)zfs_replay_create,		/* TX_CREATE */
+	(zil_replay_func_t)zfs_replay_create,		/* TX_MKDIR */
+	(zil_replay_func_t)zfs_replay_create,		/* TX_MKXATTR */
+	(zil_replay_func_t)zfs_replay_create,		/* TX_SYMLINK */
+	(zil_replay_func_t)zfs_replay_remove,		/* TX_REMOVE */
+	(zil_replay_func_t)zfs_replay_remove,		/* TX_RMDIR */
+	(zil_replay_func_t)zfs_replay_link,		/* TX_LINK */
+	(zil_replay_func_t)zfs_replay_rename,		/* TX_RENAME */
+	(zil_replay_func_t)zfs_replay_write,		/* TX_WRITE */
+	(zil_replay_func_t)zfs_replay_truncate,		/* TX_TRUNCATE */
+	(zil_replay_func_t)zfs_replay_setattr,		/* TX_SETATTR */
+	(zil_replay_func_t)zfs_replay_acl_v0,		/* TX_ACL_V0 */
+	(zil_replay_func_t)zfs_replay_acl,		/* TX_ACL */
+	(zil_replay_func_t)zfs_replay_create_acl,	/* TX_CREATE_ACL */
+	(zil_replay_func_t)zfs_replay_create,		/* TX_CREATE_ATTR */
+	(zil_replay_func_t)zfs_replay_create_acl,	/* TX_CREATE_ACL_ATTR */
+	(zil_replay_func_t)zfs_replay_create_acl,	/* TX_MKDIR_ACL */
+	(zil_replay_func_t)zfs_replay_create,		/* TX_MKDIR_ATTR */
+	(zil_replay_func_t)zfs_replay_create_acl,	/* TX_MKDIR_ACL_ATTR */
+	(zil_replay_func_t)zfs_replay_write2,		/* TX_WRITE2 */
 };