Date: Fri, 1 Mar 2019 08:55:55 -0700 From: Alan Somers <asomers@freebsd.org> To: rgrimes@freebsd.org Cc: src-committers <src-committers@freebsd.org>, svn-src-projects@freebsd.org Subject: Re: svn commit: r344703 - projects/fuse2/sys/fs/fuse Message-ID: <CAOtMX2itwj_PQuFmb0p5NWg0tEHYBV7vHicgBuzKmD9fO0mFpg@mail.gmail.com> In-Reply-To: <201903011551.x21FpZUK062373@pdx.rh.CN85.dnsmgr.net> References: <201903011549.x21FnBuC091829@repo.freebsd.org> <201903011551.x21FpZUK062373@pdx.rh.CN85.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2itwj_PQuFmb0p5NWg0tEHYBV7vHicgBuzKmD9fO0mFpg>