On Tue, 2021-10-19 at 10:14 -0400, J. Bruce Fields wrote:
> On Tue, Oct 19, 2021 at 06:50:21AM -0400, Jeff Layton wrote:
> > On Tue, 2021-10-19 at 09:04 +0100, Mauro Carvalho Chehab wrote:
> > > The mandatory file locking got removed due to its problems, but
> > > there's still a comment inside fs/locks.c pointing to the removed
> > > doc.
> > >
> > > Remove it.
> > >
> > > Fixes: f7e33bdbd6d1 ("fs: remove mandatory file locking support")
> > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
> > > ---
> > >
> > > To mailbombing on a large number of people, only mailing lists were C/C on the cover.
> > > See [PATCH v3 00/23] at: https://lore.kernel.org/all/cover.1634630485.git.mchehab+huawei@xxxxxxxxxx/
> > >
> > > fs/locks.c | 1 -
> > > 1 file changed, 1 deletion(-)
> > >
> > > diff --git a/fs/locks.c b/fs/locks.c
> > > index d397394633be..94feadcdab4e 100644
> > > --- a/fs/locks.c
> > > +++ b/fs/locks.c
> > > @@ -61,7 +61,6 @@
> > > *
> > > * Initial implementation of mandatory locks. SunOS turned out to be
> > > * a rotten model, so I implemented the "obvious" semantics.
> > > - * See 'Documentation/filesystems/mandatory-locking.rst' for details.
> > > * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), April 06, 1996.
> > > *
> > > * Don't allow mandatory locks on mmap()'ed files. Added simple functions to
> >
> > Thanks Mauro. I'll pick this into my locks branch, so it should make
> > v5.16 as well.
>
> Could we delete the rest too?
>
> We don't do those changelog-style comments any more; they're in the git
> history if you need them. I can sort of get leaving some in out of
> respect or if they've still provide some useful information. But
> keeping comments referring to code that doesn't even exist any more just
> seems confusing.
>
> --b.
>
> diff --git a/fs/locks.c b/fs/locks.c
> index 3d6fb4ae847b..2540b7aedeac 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -59,17 +59,6 @@
> * once we've checked for blocking and deadlocking.
> * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), April 03, 1996.
> *
> - * Initial implementation of mandatory locks. SunOS turned out to be
> - * a rotten model, so I implemented the "obvious" semantics.
> - * See 'Documentation/filesystems/mandatory-locking.rst' for details.
> - * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), April 06, 1996.
> - *
> - * Don't allow mandatory locks on mmap()'ed files. Added simple functions to
> - * check if a file has mandatory locks, used by mmap(), open() and creat() to
> - * see if system call should be rejected. Ref. HP-UX/SunOS/Solaris Reference
> - * Manual, Section 2.
> - * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), April 09, 1996.
> - *
> * Tidied up block list handling. Added '/proc/locks' interface.
> * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), April 24, 1996.
> *
> @@ -95,10 +84,6 @@
> * Made the block list a circular list to minimise searching in the list.
> * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), Sep 25, 1996.
> *
> - * Made mandatory locking a mount option. Default is not to allow mandatory
> - * locking.
> - * Andy Walker (andy@xxxxxxxxxxxxxxxxxxx), Oct 04, 1996.
> - *
> * Some adaptations for NFS support.
> * Olaf Kirch (okir@xxxxxxxxxxxx), Dec 1996,
> *
IDK...Do we want to "erase history" selectively like that?
Maybe we should just get rid of the whole pile of "changelog" comments
in fs/locks.c? They aren't terribly useful these days anyhow.
--
Jeff Layton <jlayton@xxxxxxxxxx>
