From owner-svn-src-projects@freebsd.org  Fri Mar  1 15:56:10 2019
Return-Path: <owner-svn-src-projects@freebsd.org>
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 6F408151BF53
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri,  1 Mar 2019 15:56:10 +0000 (UTC)
 (envelope-from asomers@gmail.com)
Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com
 [209.85.208.172])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id DC18185DA7;
 Fri,  1 Mar 2019 15:56:09 +0000 (UTC)
 (envelope-from asomers@gmail.com)
Received: by mail-lj1-f172.google.com with SMTP id v16so20798862ljg.13;
 Fri, 01 Mar 2019 07:56:09 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:references:in-reply-to:from:date
 :message-id:subject:to:cc;
 bh=T4CFONigQVWhGwAXntDGE54WKBy/03QKQQka35QKWN4=;
 b=Vom9H9UXvLhRy0EDbinM9UgJzAbpJzCKcdshlWC1mQ+DNlJNEyvkBVaMiAPjiw5uMk
 AXbAVHjXHKU6F3kjVGu1N6wskZOjJgSnxNNNb8RrfmjYijS2q/qvcOSOr+/WdR7i/MJD
 ggTmY3MN//VfzbRNO92lmpbY17+HMvB/iNdvoLqbZt5GoETm4rD9WKjfZCiOFmj5FiKc
 +UgqowWh7udVss15svNWaKlznNAiTByFMQuNAgnKke7PcXVXleRy8proh0bi5ozfTFR8
 maxcftVsn70p7vgM83+2itDZbkOgS+cZ03IIivKZEbWmXAGOP92cpDzDI6AQ8iOnLPYT
 U67Q==
X-Gm-Message-State: APjAAAUtPP81JIPg+dyBZ3BAaa/gU7RiqqbtsT6HwPSdRJqlz3P4Dxr6
 IvulJKDFlUbbs01ya+y+JpUuNddZaZLMGr5ArnF93g==
X-Google-Smtp-Source: APXvYqyM4rRllt1IR9JIthR5L0LlZ8QriqLIUKuSIvShdZzU8c3ERzIzo0Tr6rNLQUweX5pBoSpHN/I0hhdrH66NvfI=
X-Received: by 2002:a2e:81c1:: with SMTP id s1mr2867378ljg.29.1551455767633;
 Fri, 01 Mar 2019 07:56:07 -0800 (PST)
MIME-Version: 1.0
References: <201903011549.x21FnBuC091829@repo.freebsd.org>
 <201903011551.x21FpZUK062373@pdx.rh.CN85.dnsmgr.net>
In-Reply-To: <201903011551.x21FpZUK062373@pdx.rh.CN85.dnsmgr.net>
From: Alan Somers <asomers@freebsd.org>
Date: Fri, 1 Mar 2019 08:55:55 -0700
Message-ID: <CAOtMX2itwj_PQuFmb0p5NWg0tEHYBV7vHicgBuzKmD9fO0mFpg@mail.gmail.com>
Subject: Re: svn commit: r344703 - projects/fuse2/sys/fs/fuse
To: rgrimes@freebsd.org
Cc: src-committers <src-committers@freebsd.org>, svn-src-projects@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Rspamd-Queue-Id: DC18185DA7
X-Spamd-Bar: ------
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-6.93 / 15.00];
 NEURAL_HAM_MEDIUM(-1.00)[-1.000,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[];
 NEURAL_HAM_SHORT(-0.93)[-0.934,0]
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Mar 2019 15:56:10 -0000

The typo was that the previous change accidentally deleted that lock
call, and duplicated the include lines.

On Fri, Mar 1, 2019 at 8:51 AM Rodney W. Grimes
<freebsd@pdx.rh.cn85.dnsmgr.net> wrote:
>
> [ Charset UTF-8 unsupported, converting... ]
> > Author: asomers
> > Date: Fri Mar  1 15:49:11 2019
> > New Revision: 344703
> > URL: https://svnweb.freebsd.org/changeset/base/344703
> >
> > Log:
> >   Fix typos from r344664
>
> How is removing 2 includes and adding a function call a typo,
> this looks much more like:
>   Add missing lock call.
>
>
> >   Sponsored by:       The FreeBSD Foundation
> >
> > Modified:
> >   projects/fuse2/sys/fs/fuse/fuse_ipc.c
> >
> > Modified: projects/fuse2/sys/fs/fuse/fuse_ipc.c
> > ==============================================================================
> > --- projects/fuse2/sys/fs/fuse/fuse_ipc.c     Fri Mar  1 15:00:13 2019        (r344702)
> > +++ projects/fuse2/sys/fs/fuse/fuse_ipc.c     Fri Mar  1 15:49:11 2019        (r344703)
> > @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
> >  #include <sys/conf.h>
> >  #include <sys/uio.h>
> >  #include <sys/malloc.h>
> > -#include <sys/param.h>
> >  #include <sys/queue.h>
> >  #include <sys/lock.h>
> >  #include <sys/sx.h>
> > @@ -75,7 +74,6 @@ __FBSDID("$FreeBSD$");
> >  #include <sys/mount.h>
> >  #include <sys/sdt.h>
> >  #include <sys/vnode.h>
> > -#include <sys/sdt.h>
> >  #include <sys/signalvar.h>
> >  #include <sys/syscallsubr.h>
> >  #include <sys/sysctl.h>
> > @@ -298,6 +296,8 @@ fticket_wait_answer(struct fuse_ticket *ftick)
> >       sigset_t tset;
> >       int err = 0;
> >       struct fuse_data *data;
> > +
> > +     fuse_lck_mtx_lock(ftick->tk_aw_mtx);
> >
> >       if (fticket_answered(ftick)) {
> >               goto out;
> >
> >
>
> --
> Rod Grimes                                                 rgrimes@freebsd.org