From: Mike Snitzer Date: Wed, 26 Nov 2025 06:01:27 +0000 (-0500) Subject: nfs/localio: remove 61 byte hole from needless ____cacheline_aligned X-Git-Tag: v6.19-rc1~27^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b873de2c02f9cc655bef6bee0eb9e404126ed6c;p=thirdparty%2Flinux.git nfs/localio: remove 61 byte hole from needless ____cacheline_aligned struct nfs_local_kiocb used ____cacheline_aligned on its iters[] array and as the structure evolved it caused a 61 byte hole to form. Fix this by removing ____cacheline_aligned and reordering iters[] before iter_is_dio_aligned[]. Fixes: 6a218b9c3183 ("nfs/localio: do not issue misaligned DIO out-of-order") Signed-off-by: Mike Snitzer Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/localio.c b/fs/nfs/localio.c index 512d9c5ff608..b98bb292fef0 100644 --- a/fs/nfs/localio.c +++ b/fs/nfs/localio.c @@ -43,8 +43,8 @@ struct nfs_local_kiocb { size_t end_len; short int end_iter_index; atomic_t n_iters; + struct iov_iter iters[NFSLOCAL_MAX_IOS]; bool iter_is_dio_aligned[NFSLOCAL_MAX_IOS]; - struct iov_iter iters[NFSLOCAL_MAX_IOS] ____cacheline_aligned; /* End mostly DIO-specific members */ };