| Message ID | 20191213141046.1770441-1-arnd@arndb.de (mailing list archive) |
|---|---|
| Headers | show |
| Series | nfsd: avoid 32-bit time_t | expand |
On Fri, Dec 13, 2019 at 3:12 PM Arnd Bergmann <arnd@arndb.de> wrote: > > Hi Bruce, Chuck, > > NFSd is one of the last areas of the kernel that is not y2038 safe > yet, this series addresses the remaining issues here. > > I did not get any comments for the first version I posted [1], and > I hope this just means that everything was fine and you plan to > merge this soon ;-) > > I uploaded a git branch to [2] for testing. > > Please review and merge for linux-5.6 so we can remove the 32-bit > time handling from that release. I've included the update y2038 nfsd branch from git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-nfsd-v2 in my y2038 branch now, so it should be part of linux-next from the coming snapshot. My plan is to send a linux-5.6 pull request to the nfsd maintainers for this branch unless we find bugs in linux-next or I get more review comments. Arnd
On Wed, Dec 18, 2019 at 06:21:06PM +0100, Arnd Bergmann wrote: > On Fri, Dec 13, 2019 at 3:12 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > > Hi Bruce, Chuck, > > > > NFSd is one of the last areas of the kernel that is not y2038 safe > > yet, this series addresses the remaining issues here. > > > > I did not get any comments for the first version I posted [1], and > > I hope this just means that everything was fine and you plan to > > merge this soon ;-) > > > > I uploaded a git branch to [2] for testing. > > > > Please review and merge for linux-5.6 so we can remove the 32-bit > > time handling from that release. > > I've included the update y2038 nfsd branch from > > git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-nfsd-v2 > > in my y2038 branch now, so it should be part of linux-next from the coming > snapshot. My plan is to send a linux-5.6 pull request to the nfsd > maintainers for > this branch unless we find bugs in linux-next or I get more review comments. Sorry for the silence. The patches look fine to me, so I took them from your git branch and applied them to my local tree (after fixing up some minor conflicts with the copy patches) and then saw some delegation-related test failures, which I haven't had the chance to investigate yet. Hopefully before the end of the week. --b.
On Wed, Dec 18, 2019 at 6:25 PM J. Bruce Fields <bfields@fieldses.org> wrote: > On Wed, Dec 18, 2019 at 06:21:06PM +0100, Arnd Bergmann wrote: > > On Fri, Dec 13, 2019 at 3:12 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git y2038-nfsd-v2 > > > > in my y2038 branch now, so it should be part of linux-next from the coming > > snapshot. My plan is to send a linux-5.6 pull request to the nfsd > > maintainers for > > this branch unless we find bugs in linux-next or I get more review comments. > > Sorry for the silence. The patches look fine to me, so I took them from > your git branch and applied them to my local tree (after fixing up some > minor conflicts with the copy patches) and then saw some > delegation-related test failures, which I haven't had the chance to > investigate yet. Hopefully before the end of the week. Ok, I've taken the nfsd changes out of my y2038 branch again then, to make sure we don't get these regressions in linux-next. Thanks for taking care of the patches. I will not be in the office from Friday to the end of the year, so probably won't be able to respin the series quickly once you find the bug(s), but I should be able to reply to emails about this. Arnd
Hi Bruce, Chuck, NFSd is one of the last areas of the kernel that is not y2038 safe yet, this series addresses the remaining issues here. I did not get any comments for the first version I posted [1], and I hope this just means that everything was fine and you plan to merge this soon ;-) I uploaded a git branch to [2] for testing. Please review and merge for linux-5.6 so we can remove the 32-bit time handling from that release. Arnd Changes from v1: - separate nfs and nfsd, as most of the nfs changes are merged now - rebase to v5.5 [1] https://lore.kernel.org/lkml/20191111201639.2240623-1-arnd@arndb.de/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git/log/?h=y2038-nfsd Arnd Bergmann (12): nfsd: use ktime_get_seconds() for timestamps nfsd: print 64-bit timestamps in client_info_show nfsd: handle nfs3 timestamps as unsigned nfsd: use timespec64 in encode_time_delta nfsd: make 'boot_time' 64-bit wide nfsd: pass a 64-bit guardtime to nfsd_setattr() nfsd: use time64_t in nfsd_proc_setattr() check nfsd: fix delay timer on 32-bit architectures nfsd: fix jiffies/time_t mixup in LRU list nfsd: use boottime for lease expiry alculation nfsd: use ktime_get_real_seconds() in nfs4_verifier nfsd: remove nfs4_reset_lease() declarations fs/nfsd/netns.h | 6 ++-- fs/nfsd/nfs3xdr.c | 20 +++++-------- fs/nfsd/nfs4callback.c | 7 ++++- fs/nfsd/nfs4layouts.c | 2 +- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4recover.c | 8 ++--- fs/nfsd/nfs4state.c | 68 ++++++++++++++++++++---------------------- fs/nfsd/nfs4xdr.c | 4 +-- fs/nfsd/nfsctl.c | 6 ++-- fs/nfsd/nfsd.h | 2 -- fs/nfsd/nfsfh.h | 4 +-- fs/nfsd/nfsproc.c | 6 ++-- fs/nfsd/state.h | 10 +++---- fs/nfsd/vfs.c | 4 +-- fs/nfsd/vfs.h | 2 +- fs/nfsd/xdr3.h | 2 +- 16 files changed, 74 insertions(+), 79 deletions(-)