D37866.id114525.diff
No OneTemporary
Actions

Size

832 B

Referenced Files

None

Subscribers

None

D37866.id114525.diff
View Options

	diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
	--- a/sys/fs/tmpfs/tmpfs_subr.c
	+++ b/sys/fs/tmpfs/tmpfs_subr.c
	@@ -2325,29 +2325,19 @@
	int
	tmpfs_truncate(struct vnode *vp, off_t length)
	{
	- int error;
	struct tmpfs_node *node;
	+ int error;

	- node = VP_TO_TMPFS_NODE(vp);
	-
	- if (length < 0) {
	- error = EINVAL;
	- goto out;
	- }
	-
	- if (node->tn_size == length) {
	- error = 0;
	- goto out;
	- }
	-
	+ if (length < 0)
	+ return (EINVAL);
	if (length > VFS_TO_TMPFS(vp->v_mount)->tm_maxfilesize)
	return (EFBIG);

	- error = tmpfs_reg_resize(vp, length, FALSE);
	+ node = VP_TO_TMPFS_NODE(vp);
	+ error = node->tn_size == length ? 0 : tmpfs_reg_resize(vp, length,
	+ FALSE);
	if (error == 0)
	node->tn_status \|= TMPFS_NODE_CHANGED \| TMPFS_NODE_MODIFIED;
	-
	-out:
	tmpfs_update(vp);

	return (error);