Date: Fri, 2 Aug 2019 11:53:52 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20190802105352.GF2899@work-vm> References: <5D43F688.8000607@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5D43F688.8000607@huawei.com> Subject: Re: [Virtio-fs] [PATCH v2] virtiofsd: fix compile error if 'F_OFD_GETLK' not defined List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: piaojun Cc: virtio-fs@redhat.com, eblake@redhat.com, qemu-devel@nongnu.org * piaojun (piaojun@huawei.com) wrote: > Use F_GETLK for fcntl when F_OFD_GETLK not defined, such as kernel 3.10. > > Signed-off-by: Jun Piao > --- > v2: > - Use F_OFD_SETLK to replace F_OFD_GETLK in #ifdef. > > --- > contrib/virtiofsd/passthrough_ll.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthrough_ll.c > index a81c01d..c69f2f3 100644 > --- a/contrib/virtiofsd/passthrough_ll.c > +++ b/contrib/virtiofsd/passthrough_ll.c > @@ -1780,7 +1780,11 @@ static void lo_getlk(fuse_req_t req, fuse_ino_t ino, > goto out; > } > > +#ifdef F_OFD_GETLK > ret = fcntl(plock->fd, F_OFD_GETLK, lock); > +#else > + ret = fcntl(plock->fd, F_GETLK, lock); > +#endif > if (ret == -1) > saverr = errno; > > @@ -1831,7 +1835,11 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino, > > /* TODO: Is it alright to modify flock? */ > lock->l_pid = 0; > +#ifdef F_OFD_SETLK > ret = fcntl(plock->fd, F_OFD_SETLK, lock); > +#else > + ret = fcntl(plock->fd, F_GETLK, lock); ^^^^^^^ Typo! You've got GETLK rather than SETLK. But, a bigger question - does this actually work! The manpage says: 'If a process closes any file descriptor referring to a file, then all of the process's locks on that file are released, regardless of the file descriptor(s) on which the locks were obtained.' the fd we're using here came from lookup_create_plock_ctx which did a new openat to get this fd; so we've already got multiple fd's referring to this file; and thus I worry we're going to close one of them and lose all our locks on it. Dave > +#endif > if (ret == -1) { > saverr = errno; > } > -- -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK