From owner-svn-src-projects@freebsd.org Fri Mar 15 17:04:39 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 702C61526FD3 for ; Fri, 15 Mar 2019 17:04:39 +0000 (UTC) (envelope-from asomers@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 123BB714A2; Fri, 15 Mar 2019 17:04:39 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA49ED214; Fri, 15 Mar 2019 17:04:38 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2FH4cXu049017; Fri, 15 Mar 2019 17:04:38 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2FH4XBl048993; Fri, 15 Mar 2019 17:04:33 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201903151704.x2FH4XBl048993@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 15 Mar 2019 17:04:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345191 - projects/fuse2/tests/sys/fs/fuse X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/fuse2/tests/sys/fs/fuse X-SVN-Commit-Revision: 345191 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 123BB714A2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 17:04:39 -0000 Author: asomers Date: Fri Mar 15 17:04:33 2019 New Revision: 345191 URL: https://svnweb.freebsd.org/changeset/base/345191 Log: fuse(4): combine common code in the tests Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/tests/sys/fs/fuse/create.cc projects/fuse2/tests/sys/fs/fuse/flush.cc projects/fuse2/tests/sys/fs/fuse/fsync.cc projects/fuse2/tests/sys/fs/fuse/getattr.cc projects/fuse2/tests/sys/fs/fuse/link.cc projects/fuse2/tests/sys/fs/fuse/locks.cc projects/fuse2/tests/sys/fs/fuse/lookup.cc projects/fuse2/tests/sys/fs/fuse/mkdir.cc projects/fuse2/tests/sys/fs/fuse/mknod.cc projects/fuse2/tests/sys/fs/fuse/mockfs.cc projects/fuse2/tests/sys/fs/fuse/open.cc projects/fuse2/tests/sys/fs/fuse/opendir.cc projects/fuse2/tests/sys/fs/fuse/read.cc projects/fuse2/tests/sys/fs/fuse/readdir.cc projects/fuse2/tests/sys/fs/fuse/readlink.cc projects/fuse2/tests/sys/fs/fuse/release.cc projects/fuse2/tests/sys/fs/fuse/releasedir.cc projects/fuse2/tests/sys/fs/fuse/rmdir.cc projects/fuse2/tests/sys/fs/fuse/setattr.cc projects/fuse2/tests/sys/fs/fuse/statfs.cc projects/fuse2/tests/sys/fs/fuse/symlink.cc projects/fuse2/tests/sys/fs/fuse/utils.cc projects/fuse2/tests/sys/fs/fuse/write.cc projects/fuse2/tests/sys/fs/fuse/xattr.cc Modified: projects/fuse2/tests/sys/fs/fuse/create.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/create.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/create.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -62,8 +62,7 @@ TEST_F(Create, DISABLED_attr_cache) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, create); out->body.create.entry.attr.mode = S_IFREG | mode; out->body.create.entry.nodeid = ino; @@ -145,8 +144,7 @@ TEST_F(Create, DISABLED_Enosys) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, create); out->body.create.entry.attr.mode = S_IFREG | mode; out->body.create.entry.nodeid = ino; @@ -160,8 +158,7 @@ TEST_F(Create, DISABLED_Enosys) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto in __unused, auto out) { out->header.len = sizeof(out->header); SET_OUT_HEADER_LEN(out, open); }))); @@ -173,8 +170,7 @@ TEST_F(Create, DISABLED_Enosys) in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -214,8 +210,7 @@ TEST_F(Create, DISABLED_entry_cache_negative) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, create); out->body.create.entry.attr.mode = S_IFREG | mode; out->body.create.entry.nodeid = ino; @@ -230,8 +225,7 @@ TEST_F(Create, DISABLED_entry_cache_negative) in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -269,8 +263,7 @@ TEST_F(Create, DISABLED_entry_cache_negative_purge) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, create); out->body.create.entry.attr.mode = S_IFREG | mode; out->body.create.entry.nodeid = ino; @@ -284,8 +277,7 @@ TEST_F(Create, DISABLED_entry_cache_negative_purge) in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -344,8 +336,7 @@ TEST_F(Create, ok) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, create); out->body.create.entry.attr.mode = S_IFREG | mode; out->body.create.entry.nodeid = ino; @@ -360,8 +351,7 @@ TEST_F(Create, ok) in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; Modified: projects/fuse2/tests/sys/fs/fuse/flush.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/flush.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/flush.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -181,7 +181,6 @@ TEST_F(FlushWithLocks, DISABLED_unlock_on_close) }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, setlk); out->body.setlk.lk = in->body.setlk.lk; }))); Modified: projects/fuse2/tests/sys/fs/fuse/fsync.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/fsync.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/fsync.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -132,8 +132,7 @@ TEST_F(Fsync, close) return (in->header.opcode == FUSE_SETATTR); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid }))); @@ -244,8 +243,7 @@ TEST_F(Fsync, DISABLED_fsync_metadata_only) return (in->header.opcode == FUSE_SETATTR); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | mode; Modified: projects/fuse2/tests/sys/fs/fuse/getattr.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/getattr.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/getattr.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -47,8 +47,8 @@ TEST_F(Getattr, DISABLED_attr_cache) const uint64_t ino = 42; struct stat sb; - EXPECT_LOOKUP(1, RELPATH).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + EXPECT_LOOKUP(1, RELPATH) + .WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; @@ -59,8 +59,7 @@ TEST_F(Getattr, DISABLED_attr_cache) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr_valid = UINT64_MAX; out->body.attr.attr.ino = ino; // Must match nodeid @@ -97,8 +96,7 @@ TEST_F(Getattr, attr_cache_timeout) }, Eq(true)), _) ).Times(2) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr_valid_nsec = timeout_ns; out->body.attr.attr_valid = UINT64_MAX; @@ -144,8 +142,7 @@ TEST_F(Getattr, ok) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; Modified: projects/fuse2/tests/sys/fs/fuse/link.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/link.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/link.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -92,8 +92,7 @@ TEST_F(Link, ok) (0 == strcmp(name, RELPATH))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; Modified: projects/fuse2/tests/sys/fs/fuse/locks.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/locks.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/locks.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -124,7 +124,6 @@ TEST_F(Getlk, DISABLED_no_locks) }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, getlk); out->body.getlk.lk = in->body.getlk.lk; out->body.getlk.lk.type = F_UNLCK; @@ -170,8 +169,7 @@ TEST_F(Getlk, DISABLED_lock_exists) in->body.getlk.lk.pid == (uint64_t)pid); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, getlk); out->body.getlk.lk.start = 100; out->body.getlk.lk.end = 199; @@ -252,7 +250,6 @@ TEST_F(Setlk, DISABLED_set) }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, setlk); out->body.setlk.lk = in->body.setlk.lk; }))); @@ -296,7 +293,6 @@ TEST_F(Setlk, DISABLED_set_eof) }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, setlk); out->body.setlk.lk = in->body.setlk.lk; }))); @@ -413,7 +409,6 @@ TEST_F(Setlkw, DISABLED_set) }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, setlkw); out->body.setlkw.lk = in->body.setlkw.lk; }))); Modified: projects/fuse2/tests/sys/fs/fuse/lookup.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/lookup.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/lookup.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -53,8 +53,7 @@ TEST_F(Lookup, DISABLED_attr_cache) struct stat sb; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.nodeid = ino; out->body.entry.attr_valid = UINT64_MAX; @@ -120,8 +119,7 @@ TEST_F(Lookup, attr_cache_timeout) long timeout_ns = 250'000'000; EXPECT_LOOKUP(1, RELPATH) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.nodeid = ino; out->body.entry.attr_valid_nsec = timeout_ns; @@ -157,8 +155,7 @@ TEST_F(Lookup, entry_cache) const char RELPATH[] = "some_file.txt"; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.entry_valid = UINT64_MAX; out->body.entry.attr.mode = S_IFREG | 0644; @@ -227,8 +224,7 @@ TEST_F(Lookup, DISABLED_entry_cache_timeout) long timeout_ns = 250'000'000; EXPECT_LOOKUP(1, RELPATH).Times(2) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.entry_valid_nsec = timeout_ns; out->body.entry.attr.mode = S_IFREG | 0644; @@ -252,8 +248,7 @@ TEST_F(Lookup, ok) const char RELPATH[] = "some_file.txt"; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = 14; @@ -275,15 +270,13 @@ TEST_F(Lookup, subdir) uint64_t file_ino = 3; EXPECT_LOOKUP(1, DIRPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFDIR | 0755; out->body.entry.nodeid = dir_ino; }))); EXPECT_LOOKUP(dir_ino, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = file_ino; Modified: projects/fuse2/tests/sys/fs/fuse/mkdir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/mkdir.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/mkdir.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -95,8 +95,7 @@ TEST_F(Mkdir, DISABLED_entry_cache_negative) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.create.entry.attr.mode = S_IFDIR | mode; out->body.create.entry.nodeid = ino; @@ -134,8 +133,7 @@ TEST_F(Mkdir, DISABLED_entry_cache_negative_purge) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFDIR | mode; out->body.entry.nodeid = ino; @@ -168,8 +166,7 @@ TEST_F(Mkdir, ok) (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.create.entry.attr.mode = S_IFDIR | mode; out->body.create.entry.nodeid = ino; Modified: projects/fuse2/tests/sys/fs/fuse/mknod.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/mknod.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/mknod.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -67,8 +67,7 @@ void test_ok(mode_t mode, dev_t dev) { (0 == strcmp(RELPATH, name))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, create); out->body.create.entry.attr.mode = mode; out->body.create.entry.nodeid = ino; Modified: projects/fuse2/tests/sys/fs/fuse/mockfs.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/mockfs.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/mockfs.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -140,6 +140,7 @@ ReturnImmediate(std::functionheader.unique = in->header.unique; f(in, out0); out.push_back(out0); }); Modified: projects/fuse2/tests/sys/fs/fuse/open.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/open.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/open.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -56,8 +56,7 @@ void test_ok(int os_flags, int fuse_flags) { in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto in __unused, auto out) { out->header.len = sizeof(out->header); SET_OUT_HEADER_LEN(out, open); }))); @@ -69,8 +68,7 @@ void test_ok(int os_flags, int fuse_flags) { in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; Modified: projects/fuse2/tests/sys/fs/fuse/opendir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/opendir.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/opendir.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -109,8 +109,7 @@ TEST_F(Opendir, open) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, open); }))); @@ -129,8 +128,7 @@ TEST_F(Opendir, opendir) return (in->header.opcode == FUSE_STATFS); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, statfs); }))); @@ -140,8 +138,7 @@ TEST_F(Opendir, opendir) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, open); }))); Modified: projects/fuse2/tests/sys/fs/fuse/read.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/read.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/read.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -242,8 +242,7 @@ TEST_F(Read, mmap) in->body.read.size >= bufsize); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(struct fuse_out_header) + bufsize; memmove(out->body.bytes, CONTENTS, bufsize); }))); @@ -411,8 +410,7 @@ TEST_F(Read, sendfile) in->body.read.size >= bufsize); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(struct fuse_out_header) + bufsize; memmove(out->body.bytes, CONTENTS, bufsize); }))); Modified: projects/fuse2/tests/sys/fs/fuse/readdir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/readdir.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/readdir.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -59,7 +59,6 @@ void expect_readdir(uint64_t ino, uint64_t off, vector struct fuse_dirent *fde = (struct fuse_dirent*)out->body.bytes; int i = 0; - out->header.unique = in->header.unique; out->header.error = 0; out->header.len = 0; @@ -208,8 +207,7 @@ TEST_F(Readdir, nodots) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.error = 0; out->header.len = sizeof(out->header); }))); Modified: projects/fuse2/tests/sys/fs/fuse/readlink.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/readlink.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/readlink.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -82,8 +82,7 @@ TEST_F(Readlink, ok) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { strlcpy(out->body.str, dst, sizeof(out->body.str)); out->header.len = sizeof(out->header) + strlen(dst) + 1; }))); Modified: projects/fuse2/tests/sys/fs/fuse/release.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/release.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/release.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -170,7 +170,6 @@ TEST_F(ReleaseWithLocks, DISABLED_unlock_on_close) }, Eq(true)), _) ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, setlk); out->body.setlk.lk = in->body.setlk.lk; }))); Modified: projects/fuse2/tests/sys/fs/fuse/releasedir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/releasedir.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/releasedir.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -75,8 +75,7 @@ TEST_F(ReleaseDir, dup) in->body.readdir.offset == 0); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.error = 0; out->header.len = sizeof(out->header); }))); Modified: projects/fuse2/tests/sys/fs/fuse/rmdir.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/rmdir.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/rmdir.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -42,8 +42,7 @@ class Rmdir: public FuseTest { (public) void expect_lookup(const char *relpath, uint64_t ino) { EXPECT_LOOKUP(1, relpath) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFDIR | 0755; out->body.entry.nodeid = ino; Modified: projects/fuse2/tests/sys/fs/fuse/setattr.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/setattr.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/setattr.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -56,8 +56,7 @@ TEST_F(Setattr, DISABLED_attr_cache) const mode_t newmode = 0644; EXPECT_LOOKUP(1, RELPATH) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; @@ -70,8 +69,7 @@ TEST_F(Setattr, DISABLED_attr_cache) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | newmode; @@ -101,8 +99,7 @@ TEST_F(Setattr, chmod) const mode_t newmode = 0644; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | oldmode; out->body.entry.nodeid = ino; @@ -119,8 +116,7 @@ TEST_F(Setattr, chmod) in->body.setattr.mode == newmode); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | newmode; @@ -140,8 +136,7 @@ TEST_F(Setattr, chown) const uid_t newuser = 44; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; @@ -160,8 +155,7 @@ TEST_F(Setattr, chown) in->body.setattr.gid == newgroup); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -186,7 +180,6 @@ TEST_F(Setattr, eperm) EXPECT_LOOKUP(1, RELPATH) .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0777; out->body.entry.nodeid = ino; @@ -216,8 +209,7 @@ TEST_F(Setattr, fchmod) const mode_t newmode = 0644; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | oldmode; out->body.entry.nodeid = ino; @@ -230,8 +222,7 @@ TEST_F(Setattr, fchmod) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(out->header); SET_OUT_HEADER_LEN(out, open); }))); @@ -243,8 +234,7 @@ TEST_F(Setattr, fchmod) in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | oldmode; @@ -260,8 +250,7 @@ TEST_F(Setattr, fchmod) in->body.setattr.mode == newmode); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | newmode; @@ -285,8 +274,7 @@ TEST_F(Setattr, ftruncate) const off_t newsize = 12345; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0755; out->body.entry.nodeid = ino; @@ -300,8 +288,7 @@ TEST_F(Setattr, ftruncate) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(out->header); SET_OUT_HEADER_LEN(out, open); out->body.open.fh = fh; @@ -314,8 +301,7 @@ TEST_F(Setattr, ftruncate) in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0755; @@ -332,8 +318,7 @@ TEST_F(Setattr, ftruncate) in->body.setattr.fh == fh); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0755; @@ -355,8 +340,7 @@ TEST_F(Setattr, truncate) { const uint64_t newsize = 20'000'000; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; @@ -373,8 +357,7 @@ TEST_F(Setattr, truncate) { in->body.setattr.size == newsize); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -398,8 +381,7 @@ TEST_F(Setattr, utimensat) { }; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; @@ -420,8 +402,7 @@ TEST_F(Setattr, utimensat) { in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -446,8 +427,7 @@ TEST_F(Setattr, utimensat) { newtimes[1].tv_nsec); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -475,8 +455,7 @@ TEST_F(Setattr, utimensat_mtime_only) { }; EXPECT_LOOKUP(1, RELPATH) - .WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFREG | 0644; out->body.entry.nodeid = ino; @@ -497,8 +476,7 @@ TEST_F(Setattr, utimensat_mtime_only) { in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -520,8 +498,7 @@ TEST_F(Setattr, utimensat_mtime_only) { newtimes[1].tv_nsec); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; Modified: projects/fuse2/tests/sys/fs/fuse/statfs.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/statfs.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/statfs.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -86,8 +86,7 @@ TEST_F(Statfs, ok) return (in->header.opcode == FUSE_STATFS); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, statfs); out->body.statfs.st.blocks = 1000; out->body.statfs.st.bfree = 100; Modified: projects/fuse2/tests/sys/fs/fuse/symlink.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/symlink.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/symlink.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -80,8 +80,7 @@ TEST_F(Symlink, ok) (0 == strcmp(name, RELPATH))); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = S_IFLNK | 0777; out->body.entry.nodeid = ino; Modified: projects/fuse2/tests/sys/fs/fuse/utils.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/utils.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/utils.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -93,8 +93,7 @@ void FuseTest::expect_getattr(uint64_t ino, uint64_t s in->header.nodeid == ino); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; @@ -108,8 +107,7 @@ void FuseTest::expect_lookup(const char *relpath, uint { EXPECT_LOOKUP(1, relpath) .Times(times) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, entry); out->body.entry.attr.mode = mode; out->body.entry.nodeid = ino; @@ -127,8 +125,7 @@ void FuseTest::expect_open(uint64_t ino, uint32_t flag }, Eq(true)), _) ).Times(times) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(out->header); SET_OUT_HEADER_LEN(out, open); out->body.open.fh = FH; @@ -143,8 +140,7 @@ void FuseTest::expect_opendir(uint64_t ino) return (in->header.opcode == FUSE_STATFS); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, statfs); }))); @@ -154,8 +150,7 @@ void FuseTest::expect_opendir(uint64_t ino) in->header.nodeid == ino); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(out->header); SET_OUT_HEADER_LEN(out, open); out->body.open.fh = FH; @@ -174,8 +169,7 @@ void FuseTest::expect_read(uint64_t ino, uint64_t offs in->body.read.size == isize); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { out->header.len = sizeof(struct fuse_out_header) + osize; memmove(out->body.bytes, contents, osize); }))).RetiresOnSaturation(); @@ -219,8 +213,7 @@ void FuseTest::expect_write(uint64_t ino, uint64_t off 0 == bcmp(buf, contents, isize)); }, Eq(true)), _) - ).WillOnce(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, write); out->body.write.size = osize; }))); Modified: projects/fuse2/tests/sys/fs/fuse/write.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/write.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/write.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -503,8 +503,7 @@ TEST_F(WriteBack, close) return (in->header.opcode == FUSE_SETATTR); }, Eq(true)), _) - ).WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + ).WillRepeatedly(Invoke(ReturnImmediate([=](auto i __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid }))); @@ -635,8 +634,7 @@ TEST_F(WriteThrough, DISABLED_update_file_size) }, Eq(true)), _) ).Times(2) - .WillRepeatedly(Invoke(ReturnImmediate([=](auto in, auto out) { - out->header.unique = in->header.unique; + .WillRepeatedly(Invoke(ReturnImmediate([=](auto in __unused, auto out) { SET_OUT_HEADER_LEN(out, attr); out->body.attr.attr.ino = ino; // Must match nodeid out->body.attr.attr.mode = S_IFREG | 0644; Modified: projects/fuse2/tests/sys/fs/fuse/xattr.cc ============================================================================== --- projects/fuse2/tests/sys/fs/fuse/xattr.cc Fri Mar 15 16:43:28 2019 (r345190) +++ projects/fuse2/tests/sys/fs/fuse/xattr.cc Fri Mar 15 17:04:33 2019 (r345191) @@ -166,11 +166,12 @@ TEST_F(Getxattr, size_only) int ns = EXTATTR_NAMESPACE_USER; expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); - expect_getxattr(ino, "user.foo", ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; - SET_OUT_HEADER_LEN(out, getxattr); - out->body.getxattr.size = 99; - })); + expect_getxattr(ino, "user.foo", + ReturnImmediate([](auto in __unused, auto out) { + SET_OUT_HEADER_LEN(out, getxattr); + out->body.getxattr.size = 99; + }) + ); ASSERT_EQ(99, extattr_get_file(FULLPATH, ns, "foo", NULL, 0)) << strerror(errno);; @@ -190,8 +191,7 @@ TEST_F(Getxattr, system) expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); expect_getxattr(ino, "system.foo", - ReturnImmediate([&](auto in, auto out) { - out->header.unique = in->header.unique; + ReturnImmediate([&](auto in __unused, auto out) { memcpy((void*)out->body.bytes, value, value_len); out->header.len = sizeof(out->header) + value_len; }) @@ -216,8 +216,7 @@ TEST_F(Getxattr, user) expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); expect_getxattr(ino, "user.foo", - ReturnImmediate([&](auto in, auto out) { - out->header.unique = in->header.unique; + ReturnImmediate([&](auto in __unused, auto out) { memcpy((void*)out->body.bytes, value, value_len); out->header.len = sizeof(out->header) + value_len; }) @@ -277,8 +276,7 @@ TEST_F(Listxattr, size_only_empty) int ns = EXTATTR_NAMESPACE_USER; expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); - expect_listxattr(ino, 0, ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + expect_listxattr(ino, 0, ReturnImmediate([](auto i __unused, auto out) { out->body.listxattr.size = 0; SET_OUT_HEADER_LEN(out, listxattr); })); @@ -299,20 +297,21 @@ TEST_F(Listxattr, size_only_nonempty) int ns = EXTATTR_NAMESPACE_USER; expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); - expect_listxattr(ino, 0, ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + expect_listxattr(ino, 0, ReturnImmediate([](auto i __unused, auto out) { out->body.listxattr.size = 45; SET_OUT_HEADER_LEN(out, listxattr); })); // TODO: fix the expected size after fixing the size calculation bug in // fuse_vnop_listextattr. It should be exactly 45. - expect_listxattr(ino, 53, ReturnImmediate([](auto in, auto out) { - const char l[] = "user.foo"; - out->header.unique = in->header.unique; - strlcpy((char*)out->body.bytes, l, sizeof(out->body.bytes)); - out->header.len = sizeof(fuse_out_header) + sizeof(l); - })); + expect_listxattr(ino, 53, + ReturnImmediate([](auto in __unused, auto out) { + const char l[] = "user.foo"; + strlcpy((char*)out->body.bytes, l, + sizeof(out->body.bytes)); + out->header.len = sizeof(fuse_out_header) + sizeof(l); + }) + ); ASSERT_EQ(4, extattr_list_file(FULLPATH, ns, NULL, 0)) << strerror(errno); @@ -324,22 +323,22 @@ TEST_F(Listxattr, size_only_really_big) int ns = EXTATTR_NAMESPACE_USER; expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); - expect_listxattr(ino, 0, ReturnImmediate([](auto in, auto out) { - out->header.unique = in->header.unique; + expect_listxattr(ino, 0, ReturnImmediate([](auto i __unused, auto out) { out->body.listxattr.size = 16000; SET_OUT_HEADER_LEN(out, listxattr); })); // TODO: fix the expected size after fixing the size calculation bug in // fuse_vnop_listextattr. It should be exactly 16000. - expect_listxattr(ino, 16008, ReturnImmediate([](auto in, auto out) { - const char l[16] = "user.foobarbang"; - out->header.unique = in->header.unique; - for (int i=0; i < 1000; i++) { - memcpy(&out->body.bytes[16 * i], l, 16); - } - out->header.len = sizeof(fuse_out_header) + 16000; - })); + expect_listxattr(ino, 16008, + ReturnImmediate([](auto in __unused, auto out) { + const char l[16] = "user.foobarbang"; + for (int i=0; i < 1000; i++) { + memcpy(&out->body.bytes[16 * i], l, 16); + } + out->header.len = sizeof(fuse_out_header) + 16000; + }) + ); ASSERT_EQ(11000, extattr_list_file(FULLPATH, ns, NULL, 0)) << strerror(errno); @@ -358,17 +357,17 @@ TEST_F(Listxattr, user) char attrs[28] = "user.foo\0system.x\0user.bang"; expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); - expect_listxattr(ino, 0, ReturnImmediate([&](auto in, auto out) { - out->header.unique = in->header.unique; - out->body.listxattr.size = sizeof(attrs); - SET_OUT_HEADER_LEN(out, listxattr); - })); + expect_listxattr(ino, 0, + ReturnImmediate([&](auto in __unused, auto out) { + out->body.listxattr.size = sizeof(attrs); + SET_OUT_HEADER_LEN(out, listxattr); + }) + ); // TODO: fix the expected size after fixing the size calculation bug in // fuse_vnop_listextattr. expect_listxattr(ino, sizeof(attrs) + 8, - ReturnImmediate([&](auto in, auto out) { - out->header.unique = in->header.unique; + ReturnImmediate([&](auto in __unused, auto out) { memcpy((void*)out->body.bytes, attrs, sizeof(attrs)); out->header.len = sizeof(fuse_out_header) + sizeof(attrs); })); @@ -392,17 +391,17 @@ TEST_F(Listxattr, system) char attrs[28] = "user.foo\0system.x\0user.bang"; expect_lookup(RELPATH, ino, S_IFREG | 0644, 1); - expect_listxattr(ino, 0, ReturnImmediate([&](auto in, auto out) { - out->header.unique = in->header.unique; - out->body.listxattr.size = sizeof(attrs); - SET_OUT_HEADER_LEN(out, listxattr); - })); + expect_listxattr(ino, 0, + ReturnImmediate([&](auto in __unused, auto out) { + out->body.listxattr.size = sizeof(attrs); + SET_OUT_HEADER_LEN(out, listxattr); + }) + ); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***