From nobody Thu Jan 20 14:58:42 2022 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 2526E195B72B; Thu, 20 Jan 2022 14:58:43 +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 4JflyB6Gmzz3lHs; Thu, 20 Jan 2022 14:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690723; 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=9JJCiGh+JlG5+Mdi6rghx9zwi+LAGOBeq/CWDN79FkI=; b=sUmriO2Y+Ua8qOzF8plVHPkNR9INyfE8TaNEykfEBYHeLBgwXT2tlFCD6byYGoLGHxWziy x4hD4EGjUFtIxHi+4J2JKQ/NqfNhg6Fic0EtLtcd3CRj6OTXE1qLSBdWmajAC+uFopsHLB JE+fbNQjVk7S15PwAPMD2whPX5JiY5VLK//FSy3mEB9bSTtYKy0YL1Q06WDSpATt/gRXXq XYSJDw8XINAFoIXykLze12fwFm80pnNACHXMM7qKVzMpt7Y0M0a1VQsBMyEp7EKoA2JYVk 6Gg9vbMTtsY+4cBUQPE8NedoFmDDnwz5mRmct2FFHzmSng1mub73f1kmACVzag== 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 A0CF41BE3; Thu, 20 Jan 2022 14:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20KEwgU4078569; Thu, 20 Jan 2022 14:58:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KEwg4E078568; Thu, 20 Jan 2022 14:58:42 GMT (envelope-from git) Date: Thu, 20 Jan 2022 14:58:42 GMT Message-Id: <202201201458.20KEwg4E078568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 3d8562348c9c - main - fusefs: Address -Wunused-but-set-variable warnings 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d8562348c9cf1a6bdc32382f5f45a0534da094a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642690723; 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=9JJCiGh+JlG5+Mdi6rghx9zwi+LAGOBeq/CWDN79FkI=; b=ClvnXF6jPJeiMEYLvZNX2IYsNMw28/O71+5djncM64SSEcVOCepG3VjuKQK7IZQ+3CSukb bWfuSXI3voDpkmNtZ8e3Sy6OgwfVfKcPVcBIYNcRJqNXbclMpwZYKeeHuJQb85/SQHukHU v3fhfsDH9Su3ONe5TI6NSE8kQlJehZLkUNRrlNfFogiMsjBs6r0U9C8RJrktLVBT5w1gJb Pc+EI7/UEL0kCxpVsMaj3ojuLFvVtJI5e8U1dl9YxqjYrbM+ZK0gBc7ZpCszA7oxA9isPY 4HJv8pe26SvA5iT2/Yuq5pHgcc34HE+CHTOOgxzYtp5tg+aoqtYJStRPpNhxLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642690723; a=rsa-sha256; cv=none; b=LsqRgKWM7GktKOtCN3sMZmHN58ItQdxSPyblYQodYMF45a/sowmCxqlwsF9mBbrlYlHnzA D1kFCUHWz1TCw9EJCLQJOrr06Yi0pSuAohxntKug6OSoE4OU8NmjejBhtxH55jL5wir7dg KIr8NverikyexJkq6gq1wEsVMk/fEk5q+xyRowcyrdKutbOskRejC4zEthS/27JArCcF8r eG6quifiG6IlYYIGvQw77Y1AIMNJujbn07hbJPNleaH8PmHBekSmfpQRyuyM79Bgo3wp5V YKKgSYuIYMH67xcVuycrVEGOyOoE6mstEgbT5OGLffT7kBgaDNfL2fGgXXB1tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3d8562348c9cf1a6bdc32382f5f45a0534da094a commit 3d8562348c9cf1a6bdc32382f5f45a0534da094a Author: Mark Johnston AuthorDate: 2022-01-20 13:25:00 +0000 Commit: Mark Johnston CommitDate: 2022-01-20 13:25:00 +0000 fusefs: Address -Wunused-but-set-variable warnings Reviewed by: asomers MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D33957 --- sys/fs/fuse/fuse_internal.c | 8 -------- sys/fs/fuse/fuse_io.c | 6 ------ sys/fs/fuse/fuse_node.c | 3 +-- sys/fs/fuse/fuse_vnops.c | 7 ------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/sys/fs/fuse/fuse_internal.c b/sys/fs/fuse/fuse_internal.c index 0b0c24827c1e..273b4f5b8522 100644 --- a/sys/fs/fuse/fuse_internal.c +++ b/sys/fs/fuse/fuse_internal.c @@ -169,14 +169,12 @@ fuse_internal_access(struct vnode *vp, int err = 0; uint32_t mask = F_OK; int dataflags; - int vtype; struct mount *mp; struct fuse_dispatcher fdi; struct fuse_access_in *fai; struct fuse_data *data; mp = vnode_mount(vp); - vtype = vnode_vtype(vp); data = fuse_get_mpdata(mp); dataflags = data->dataflags; @@ -1169,18 +1167,14 @@ int fuse_internal_setattr(struct vnode *vp, struct vattr *vap, struct mount *mp; pid_t pid = td->td_proc->p_pid; struct fuse_data *data; - int dataflags; int err = 0; enum vtype vtyp; - int sizechanged = -1; - uint64_t newsize = 0; ASSERT_VOP_ELOCKED(vp, __func__); mp = vnode_mount(vp); fvdat = VTOFUD(vp); data = fuse_get_mpdata(mp); - dataflags = data->dataflags; fdisp_init(&fdi, sizeof(*fsai)); fdisp_make_vp(&fdi, FUSE_SETATTR, vp, td, cred); @@ -1204,8 +1198,6 @@ int fuse_internal_setattr(struct vnode *vp, struct vattr *vap, /*Truncate to a new value. */ fsai->size = vap->va_size; - sizechanged = 1; - newsize = vap->va_size; fsai->valid |= FATTR_SIZE; fuse_filehandle_getrw(vp, FWRITE, &fufh, cred, pid); diff --git a/sys/fs/fuse/fuse_io.c b/sys/fs/fuse/fuse_io.c index bd757acf64bb..07c0f958e028 100644 --- a/sys/fs/fuse/fuse_io.c +++ b/sys/fs/fuse/fuse_io.c @@ -467,7 +467,6 @@ fuse_write_biobackend(struct vnode *vp, struct uio *uio, off_t filesize; int bcount; int n, on, seqcount, err = 0; - bool last_page; const int biosize = fuse_iosize(vp); @@ -518,11 +517,6 @@ again: extending = true; bcount = on + n; } - if (howmany(((off_t)lbn * biosize + on + n - 1), PAGE_SIZE) >= - howmany(filesize, PAGE_SIZE)) - last_page = true; - else - last_page = false; if (direct_append) { /* * Take care to preserve the buffer's B_CACHE state so diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index 183229d79b9d..ca20c71eeae3 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -448,9 +448,8 @@ fuse_vnode_setsize(struct vnode *vp, off_t newsize, bool from_server) * The FUSE server changed the file size behind our back. We * should invalidate the entire cache. */ - daddr_t left_lbn, end_lbn; + daddr_t end_lbn; - left_lbn = oldsize / iosize; end_lbn = howmany(newsize, iosize); v_inval_buf_range(vp, 0, end_lbn, iosize); } diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 3384b7b84b3a..259925f54d9f 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1391,7 +1391,6 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) bool did_lookup = false; struct fuse_entry_out *feo = NULL; enum vtype vtyp; /* vnode type of target */ - off_t filesize; /* filesize of target */ uint64_t nid; @@ -1424,12 +1423,10 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) return ENOENT; /* .. is obviously a directory */ vtyp = VDIR; - filesize = 0; } else if (cnp->cn_namelen == 1 && *(cnp->cn_nameptr) == '.') { nid = VTOI(dvp); /* . is obviously a directory */ vtyp = VDIR; - filesize = 0; } else { struct timespec timeout; int ncpticks; /* here to accomodate for API contract */ @@ -1503,7 +1500,6 @@ fuse_vnop_lookup(struct vop_lookup_args *ap) } } vtyp = IFTOVT(feo->attr.mode); - filesize = feo->attr.size; } if (lookup_err && (!fdi.answ_stat || lookup_err != ENOENT)) { fdisp_destroy(&fdi); @@ -1688,7 +1684,6 @@ fuse_vnop_open(struct vop_open_args *ap) struct thread *td = ap->a_td; struct ucred *cred = ap->a_cred; pid_t pid = td->td_proc->p_pid; - struct fuse_vnode_data *fvdat; if (fuse_isdeadfs(vp)) return ENXIO; @@ -1697,8 +1692,6 @@ fuse_vnop_open(struct vop_open_args *ap) if ((a_mode & (FREAD | FWRITE | FEXEC)) == 0) return EINVAL; - fvdat = VTOFUD(vp); - if (fuse_filehandle_validrw(vp, a_mode, cred, pid)) { fuse_vnode_open(vp, 0, td); return 0;