On 22.06.2012 21:22, Dmitrijs Ledkovs wrote: > Package: autofs > Version: 5.0.6-2 > Severity: important > User: [email protected] > Usertags: origin-ubuntu quantal ubuntu-patch > > After merging 5.0.6-2 for Ubuntu I have noticed that upstart init daemon > was tracking the wrong PID of the daemon. [1] > > This resulted me into digging what has changed and I noticed the three > patches, which I have attached to this email. > > These patches [0001-0003] do three things: > > * Check mount.nfs version to be >= 1.1.1 > * Check kernel version is >= 2.6.22 > * Do above by calling nfs_version_check at pre-demonisation, hence > upstart ending up tracking `mount.nfs -V` call > * all for the sake of figuring out if probing optimisation can be used > (or something, not too sure): > > """ > The change to have the kernel process text based mount options can > introduce lengthy timeout waits when attempting a mount to a host > that is not available. > > To avoid these waits autofs should probe singleton mounts if it > thinks mount.nfs will pass text options to the kernel (which of > course implies the kernel supports this). > """ > > But, mount.nfs 1.1.1 is acient and so is linux kernel 2.6.22... so I'm > thinking to make this a no-op. and simply remove those checks. See mine > Remove-*.patch attached. > > With that patch I want to revert the upstream patches [0001-0003].
Yes, this is the same thing I'd do. There's lots of (ugly) code which can be removed. But I'm a bit uncomfortable with removing it since upstream, unfortunately, disagrees, and we'll divirge from upstream for too much. I think it's better to #ifdef them out instead, sort of like I did in another patch, do-not-check-for-modprobe-procfs-or-load-module.patch which has not been accepted by upstream so far (upstream asked for an unrelated change to go along these lines, i think it is, while not entirely reasonable, still something which can be done). Ie, I want smaller "revert" patches, not larger. :) I can deal with this myself, ie, I don't ask you to send another patch, but if you can do that, and especially if you agree, please do. I'm sorry for not getting to this before. Thanks, /mjt -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
