From nobody Mon Feb 12 18:03:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TYXPM1cwHz5BGWN; Mon, 12 Feb 2024 18:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TYXPM0K9Jz4Zfr; Mon, 12 Feb 2024 18:03:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXzc0chdLiS7001dOBUAPO6QlmekHzN9rjqY3xT0smI=; b=FVONJEChF9DqkZUl8eAq+cifsrD6wq6zoj25aCkQBA34ngzTBH5e5aMJrnqQtbY860zn5q HX2rCG267359yVYsM+3zxAkVj7KcjEGTtlodNULrMhWiE849pqtIOViA53w0HysEYKY9bv /crr3rCrFy8CRaJ1R3YHn0dcaBxRqa4CSJfmMsjwj77PTNjU4bHiXGqIGexiPBFhyecszM K1JMdY8Oe6pNKuLbTU/12mudirok1gDJvLdH1dd2mvorJ9m6xcS1tRlvDvwh3r/wDxAXa/ xmOJ0z/su1hYn7wuLdJXqdJh5dE7tUdVANGLyHZOMx7/IMyXAdbP7wjqYEtnlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707760983; a=rsa-sha256; cv=none; b=cDQlJVxO6r4t72xYb+y5Q1a2BGykGK3ND6+S8Rmt8xx7tK5nDX+AQ6agX8TzaO7pIFpysW Na4CEvLra7gI2FPsvqPpV2pf9BgzpAcuu+Kpgv4632gCQRQw4kYfrraPlOOF80fKgCjWE6 Qx/2+CtwUjqHthP7zVFM/4CEPF7e/u0YsuDrt85TMYDeW6B2anABxcA4eItgZyKMd4Dz8L Rsb4mDEqE1hMwWFeR906oScvy2fRFFKx4UwNMSlSs3WfJapeenSlNj580RhOCxNRmAG4BE BAbk5/8J0+Eva/xImz9eYxEwhwEZX6j2tT4GV0kbqJbfxtJ27+ioglBllR9JIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707760983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IXzc0chdLiS7001dOBUAPO6QlmekHzN9rjqY3xT0smI=; b=dsCLaLDN2qU4wrbVbgjU5m99NdVQ9EBMM4dzO8U/waoanPOO5+zgJK0Lh6M5/6jvUoH2C7 zrYbUQTbVZkgo7H9s6Wo/yHMmpUNbUQbJuBhR0MfZaQjUIDKnsvV73jhTru72uJi69OS+i LNA0fPqNAdq+wiV1H29l3cWMAFW59kpzmr1k+Xzsk/H8oa+gJiavt8BaYX3LU7iU4HsL7r BUWZrZnWWVc+A0+DtGUQNZKeQ7zSwDoGuHV1e2oTLrT0lgtmlHACZ5oC3UgOx2E3NjVksb A4vabMvdBgSIQ3H7iOswBYI4kacHdWvoGP+3s6dQZ/hvTsrwcpPIedZJk09nJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TYXPL6WTRzhg5; Mon, 12 Feb 2024 18:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41CI32Pw046574; Mon, 12 Feb 2024 18:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41CI32EC046571; Mon, 12 Feb 2024 18:03:02 GMT (envelope-from git) Date: Mon, 12 Feb 2024 18:03:02 GMT Message-Id: <202402121803.41CI32EC046571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f3d5f910d53d - stable/13 - fusefs: more consistent operand ordering in io.cc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f3d5f910d53df724e81421d3a8ac841c46bfdf81 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f3d5f910d53df724e81421d3a8ac841c46bfdf81 commit f3d5f910d53df724e81421d3a8ac841c46bfdf81 Author: Alan Somers AuthorDate: 2024-01-15 23:16:40 +0000 Commit: Alan Somers CommitDate: 2024-02-12 18:02:44 +0000 fusefs: more consistent operand ordering in io.cc (cherry picked from commit daf26f9350cf8fb3ae60d4528b60ddf65a56f5cc) --- tests/sys/fs/fusefs/io.cc | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index fc648f44d755..77df0ceede64 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -281,7 +281,7 @@ void do_ftruncate(off_t offs) m_filesize = offs; } -void do_mapread(ssize_t size, off_t offs) +void do_mapread(off_t offs, ssize_t size) { void *control_buf, *p; off_t pg_offset, page_mask; @@ -307,7 +307,7 @@ void do_mapread(ssize_t size, off_t offs) free(control_buf); } -void do_read(ssize_t size, off_t offs) +void do_read(off_t offs, ssize_t size) { void *test_buf, *control_buf; ssize_t r; @@ -331,7 +331,7 @@ void do_read(ssize_t size, off_t offs) free(test_buf); } -void do_mapwrite(ssize_t size, off_t offs) +void do_mapwrite(off_t offs, ssize_t size) { char *buf; void *p; @@ -368,7 +368,7 @@ void do_mapwrite(ssize_t size, off_t offs) ASSERT_EQ(0, munmap(p, map_size)) << strerror(errno); } -void do_write(ssize_t size, off_t offs) +void do_write(off_t offs, ssize_t size) { char *buf; long i; @@ -416,9 +416,9 @@ TEST_P(Io, extend_from_dirty_page) ssize_t rsize = 0x9b22; off_t truncsize = 0x28702; - do_write(wsize, wofs); + do_write(wofs, wsize); do_ftruncate(truncsize); - do_read(rsize, rofs); + do_read(rofs, rsize); } /* @@ -428,9 +428,9 @@ TEST_P(Io, extend_from_dirty_page) */ TEST_P(IoCacheable, extend_by_mapwrite) { - do_mapwrite(0x849e, 0x29a3a); /* [0x29a3a, 0x31ed7] */ - do_mapwrite(0x3994, 0x3c7d8); /* [0x3c7d8, 0x4016b] */ - do_read(0xf556, 0x30c16); /* [0x30c16, 0x4016b] */ + do_mapwrite(0x29a3a, 0x849e); /* [0x29a3a, 0x31ed7] */ + do_mapwrite(0x3c7d8, 0x3994); /* [0x3c7d8, 0x4016b] */ + do_read(0x30c16, 0xf556); /* [0x30c16, 0x4016b] */ } /* @@ -442,9 +442,9 @@ TEST_P(IoCacheable, extend_by_mapwrite) */ TEST_P(Io, last_page) { - do_write(0xcc77, 0x1134f); /* [0x1134f, 0x1dfc5] */ - do_write(0xdfa7, 0x2096a); /* [0x2096a, 0x2e910] */ - do_read(0xb5b7, 0x1a3aa); /* [0x1a3aa, 0x25960] */ + do_write(0x1134f, 0xcc77); /* [0x1134f, 0x1dfc5] */ + do_write(0x2096a, 0xdfa7); /* [0x2096a, 0x2e910] */ + do_read(0x1a3aa, 0xb5b7); /* [0x1a3aa, 0x25960] */ } /* @@ -454,8 +454,8 @@ TEST_P(Io, last_page) */ TEST_P(IoCacheable, mapread_hole) { - do_write(0x123b7, 0xf205); /* [0xf205, 0x215bb] */ - do_mapread(0xeeea, 0x2f4c); /* [0x2f4c, 0x11e35] */ + do_write(0xf205, 0x123b7); /* [0xf205, 0x215bb] */ + do_mapread(0x2f4c, 0xeeea); /* [0x2f4c, 0x11e35] */ } /* @@ -470,8 +470,8 @@ TEST_P(Io, read_hole_from_cached_block) off_t rofs = 0x472e; ssize_t rsize = 0xd8d5; - do_write(wsize, wofs); - do_read(rsize, rofs); + do_write(wofs, wsize); + do_read(rofs, rsize); } /* @@ -491,10 +491,10 @@ TEST_P(Io, truncate_into_dirty_buffer) ssize_t rsize = 0x29ff; off_t truncsize1 = 0x152b4; - do_write(wsize0, wofs0); - do_write(wsize1, wofs1); + do_write(wofs0, wsize0); + do_write(wofs1, wsize1); do_ftruncate(truncsize0); - do_read(rsize, rofs); + do_read(rofs, rsize); do_ftruncate(truncsize1); close(m_test_fd); } @@ -523,11 +523,11 @@ TEST_P(Io, truncate_into_dirty_buffer2) * Creates a dirty buffer. The part in lbn 2 doesn't flush * synchronously. */ - do_write(wsize, wofs); + do_write(wofs, wsize); /* Truncates part of the dirty buffer created in step 2 */ do_ftruncate(truncsize1); /* XXX ?I don't know why this is necessary? */ - do_read(rsize2, rofs2); + do_read(rofs2, rsize2); /* Truncates the dirty buffer */ do_ftruncate(truncsize2); close(m_test_fd); @@ -558,10 +558,10 @@ TEST_P(Io, truncate_into_dirty_buffer2) */ TEST_P(Io, resize_a_valid_buffer_while_extending) { - do_write(0x14530, 0x36ee6); /* [0x36ee6, 0x4b415] */ - do_write(0x1507c, 0x33256); /* [0x33256, 0x482d1] */ - do_write(0x175c, 0x4c03d); /* [0x4c03d, 0x4d798] */ - do_read(0xe277, 0x3599c); /* [0x3599c, 0x43c12] */ + do_write(0x36ee6, 0x14530); /* [0x36ee6, 0x4b415] */ + do_write(0x33256, 0x1507c); /* [0x33256, 0x482d1] */ + do_write(0x4c03d, 0x175c); /* [0x4c03d, 0x4d798] */ + do_read(0x3599c, 0xe277); /* [0x3599c, 0x43c12] */ close(m_test_fd); } @@ -572,7 +572,7 @@ TEST_P(Io, resize_a_valid_buffer_while_extending) */ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) { - do_mapwrite(0x1bbc3, 0x3b4e0); + do_mapwrite(0x3b4e0, 0x1bbc3); } /* @@ -581,7 +581,7 @@ TEST_P(IoCacheable, vnode_pager_generic_putpage_clean_block_at_eof) */ TEST_P(IoCopyFileRange, copy_file_range_from_mapped_write) { - do_mapwrite(0x1000, 0); + do_mapwrite(0, 0x1000); do_copy_file_range(0, 0x1000, 0x1000); do_read(0x1000, 0x1000); }