Date: Thursday, November 3, 2022 @ 17:49:14 Author: andyrtr Revision: 460500
upgpkg: linux-lts 5.15.77-1: upstream update 5.15.77 Modified: linux-lts/trunk/PKGBUILD linux-lts/trunk/config Deleted: linux-lts/trunk/0006-Fix-NFSv4-mount-regression.patch ---------------------------------------+ 0006-Fix-NFSv4-mount-regression.patch | 238 -------------------------------- PKGBUILD | 12 - config | 2 3 files changed, 6 insertions(+), 246 deletions(-) Deleted: 0006-Fix-NFSv4-mount-regression.patch =================================================================== --- 0006-Fix-NFSv4-mount-regression.patch 2022-11-03 17:37:53 UTC (rev 460499) +++ 0006-Fix-NFSv4-mount-regression.patch 2022-11-03 17:49:14 UTC (rev 460500) @@ -1,238 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Sat, 6 Aug 2022 22:54:33 +0200 -Subject: [PATCH] Fix NFSv4 mount regression - -This reverts commit 6f2836341d8a (NFSv4.1 query for fs_location attr on -a new file system, 2022-01-12). - -For: https://bugs.archlinux.org/task/73838 -For: https://bugs.archlinux.org/task/73860 ---- - fs/nfs/client.c | 7 ---- - fs/nfs/nfs4_fs.h | 9 +++-- - fs/nfs/nfs4proc.c | 76 ++++++----------------------------------- - fs/nfs/nfs4state.c | 3 +- - include/linux/nfs_xdr.h | 1 - - 5 files changed, 15 insertions(+), 81 deletions(-) - -diff --git a/fs/nfs/client.c b/fs/nfs/client.c -index 090b16890e3d..551833862171 100644 ---- a/fs/nfs/client.c -+++ b/fs/nfs/client.c -@@ -860,13 +860,6 @@ int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs - server->namelen = pathinfo.max_namelen; - } - -- if (clp->rpc_ops->discover_trunking != NULL && -- (server->caps & NFS_CAP_FS_LOCATIONS)) { -- error = clp->rpc_ops->discover_trunking(server, mntfh); -- if (error < 0) -- return error; -- } -- - return 0; - } - EXPORT_SYMBOL_GPL(nfs_probe_fsinfo); -diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h -index f8672a34fd63..36471dd0e82b 100644 ---- a/fs/nfs/nfs4_fs.h -+++ b/fs/nfs/nfs4_fs.h -@@ -261,8 +261,8 @@ struct nfs4_state_maintenance_ops { - }; - - struct nfs4_mig_recovery_ops { -- int (*get_locations)(struct nfs_server *, struct nfs_fh *, -- struct nfs4_fs_locations *, struct page *, const struct cred *); -+ int (*get_locations)(struct inode *, struct nfs4_fs_locations *, -+ struct page *, const struct cred *); - int (*fsid_present)(struct inode *, const struct cred *); - }; - -@@ -304,9 +304,8 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait); - extern int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle); - extern int nfs4_proc_fs_locations(struct rpc_clnt *, struct inode *, const struct qstr *, - struct nfs4_fs_locations *, struct page *); --extern int nfs4_proc_get_locations(struct nfs_server *, struct nfs_fh *, -- struct nfs4_fs_locations *, -- struct page *page, const struct cred *); -+extern int nfs4_proc_get_locations(struct inode *, struct nfs4_fs_locations *, -+ struct page *page, const struct cred *); - extern int nfs4_proc_fsid_present(struct inode *, const struct cred *); - extern struct rpc_clnt *nfs4_proc_lookup_mountpoint(struct inode *, - struct dentry *, -diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c -index a808763c52c1..7c05dbe595ac 100644 ---- a/fs/nfs/nfs4proc.c -+++ b/fs/nfs/nfs4proc.c -@@ -3962,60 +3962,6 @@ int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) - return err; - } - --static int _nfs4_discover_trunking(struct nfs_server *server, -- struct nfs_fh *fhandle) --{ -- struct nfs4_fs_locations *locations = NULL; -- struct page *page; -- const struct cred *cred; -- struct nfs_client *clp = server->nfs_client; -- const struct nfs4_state_maintenance_ops *ops = -- clp->cl_mvops->state_renewal_ops; -- int status = -ENOMEM; -- -- cred = ops->get_state_renewal_cred(clp); -- if (cred == NULL) { -- cred = nfs4_get_clid_cred(clp); -- if (cred == NULL) -- return -ENOKEY; -- } -- -- page = alloc_page(GFP_KERNEL); -- locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL); -- if (page == NULL || locations == NULL) -- goto out; -- -- status = nfs4_proc_get_locations(server, fhandle, locations, page, -- cred); -- if (status) -- goto out; --out: -- if (page) -- __free_page(page); -- kfree(locations); -- return status; --} -- --static int nfs4_discover_trunking(struct nfs_server *server, -- struct nfs_fh *fhandle) --{ -- struct nfs4_exception exception = { -- .interruptible = true, -- }; -- struct nfs_client *clp = server->nfs_client; -- int err = 0; -- -- if (!nfs4_has_session(clp)) -- goto out; -- do { -- err = nfs4_handle_exception(server, -- _nfs4_discover_trunking(server, fhandle), -- &exception); -- } while (exception.retry); --out: -- return err; --} -- - static int _nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, - struct nfs_fsinfo *info) - { -@@ -7951,18 +7897,18 @@ int nfs4_proc_fs_locations(struct rpc_clnt *client, struct inode *dir, - * appended to this compound to identify the client ID which is - * performing recovery. - */ --static int _nfs40_proc_get_locations(struct nfs_server *server, -- struct nfs_fh *fhandle, -+static int _nfs40_proc_get_locations(struct inode *inode, - struct nfs4_fs_locations *locations, - struct page *page, const struct cred *cred) - { -+ struct nfs_server *server = NFS_SERVER(inode); - struct rpc_clnt *clnt = server->client; - u32 bitmask[2] = { - [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, - }; - struct nfs4_fs_locations_arg args = { - .clientid = server->nfs_client->cl_clientid, -- .fh = fhandle, -+ .fh = NFS_FH(inode), - .page = page, - .bitmask = bitmask, - .migration = 1, /* skip LOOKUP */ -@@ -8008,17 +7954,17 @@ static int _nfs40_proc_get_locations(struct nfs_server *server, - * When the client supports GETATTR(fs_locations_info), it can - * be plumbed in here. - */ --static int _nfs41_proc_get_locations(struct nfs_server *server, -- struct nfs_fh *fhandle, -+static int _nfs41_proc_get_locations(struct inode *inode, - struct nfs4_fs_locations *locations, - struct page *page, const struct cred *cred) - { -+ struct nfs_server *server = NFS_SERVER(inode); - struct rpc_clnt *clnt = server->client; - u32 bitmask[2] = { - [0] = FATTR4_WORD0_FSID | FATTR4_WORD0_FS_LOCATIONS, - }; - struct nfs4_fs_locations_arg args = { -- .fh = fhandle, -+ .fh = NFS_FH(inode), - .page = page, - .bitmask = bitmask, - .migration = 1, /* skip LOOKUP */ -@@ -8067,28 +8013,27 @@ static int _nfs41_proc_get_locations(struct nfs_server *server, - * -NFS4ERR_LEASE_MOVED is returned if the server still has leases - * from this client that require migration recovery. - */ --int nfs4_proc_get_locations(struct nfs_server *server, -- struct nfs_fh *fhandle, -+int nfs4_proc_get_locations(struct inode *inode, - struct nfs4_fs_locations *locations, - struct page *page, const struct cred *cred) - { -+ struct nfs_server *server = NFS_SERVER(inode); - struct nfs_client *clp = server->nfs_client; - const struct nfs4_mig_recovery_ops *ops = - clp->cl_mvops->mig_recovery_ops; - struct nfs4_exception exception = { - .interruptible = true, - }; - int status; - - dprintk("%s: FSID %llx:%llx on \"%s\"\n", __func__, - (unsigned long long)server->fsid.major, - (unsigned long long)server->fsid.minor, - clp->cl_hostname); -- nfs_display_fhandle(fhandle, __func__); -+ nfs_display_fhandle(NFS_FH(inode), __func__); - - do { -- status = ops->get_locations(server, fhandle, locations, page, -- cred); -+ status = ops->get_locations(inode, locations, page, cred); - if (status != -NFS4ERR_DELAY) - break; - nfs4_handle_exception(server, status, &exception); -@@ -10588,7 +10533,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = { - .free_client = nfs4_free_client, - .create_server = nfs4_create_server, - .clone_server = nfs_clone_server, -- .discover_trunking = nfs4_discover_trunking, - }; - - static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = { -diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c -index 83c88b54d712..42707e12d35c 100644 ---- a/fs/nfs/nfs4state.c -+++ b/fs/nfs/nfs4state.c -@@ -2098,8 +2098,7 @@ static int nfs4_try_migration(struct nfs_server *server, const struct cred *cred - } - - inode = d_inode(server->super->s_root); -- result = nfs4_proc_get_locations(server, NFS_FH(inode), locations, -- page, cred); -+ result = nfs4_proc_get_locations(inode, locations, page, cred); - if (result) { - dprintk("<-- %s: failed to retrieve fs_locations: %d\n", - __func__, result); -diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h -index ecd74cc34797..e9698b6278a5 100644 ---- a/include/linux/nfs_xdr.h -+++ b/include/linux/nfs_xdr.h -@@ -1805,7 +1805,6 @@ struct nfs_rpc_ops { - struct nfs_server *(*create_server)(struct fs_context *); - struct nfs_server *(*clone_server)(struct nfs_server *, struct nfs_fh *, - struct nfs_fattr *, rpc_authflavor_t); -- int (*discover_trunking)(struct nfs_server *, struct nfs_fh *); - }; - - /* Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-03 17:37:53 UTC (rev 460499) +++ PKGBUILD 2022-11-03 17:49:14 UTC (rev 460500) @@ -1,8 +1,8 @@ # Maintainer: Andreas Radke <[email protected]> pkgbase=linux-lts -pkgver=5.15.76 -pkgrel=2 +pkgver=5.15.77 +pkgrel=1 pkgdesc='LTS Linux' url="https://www.kernel.org/"; arch=(x86_64) @@ -21,7 +21,6 @@ 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch 0005-lg-laptop-Recognize-more-models.patch - 0006-Fix-NFSv4-mount-regression.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -28,15 +27,14 @@ '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('9007a020c419e3625b980e361be09f70ebd99e156ccb66129a981483d065d57f' +sha256sums=('142f841f33796a84c62fae2f2b96d2120bd8bbf9e0aac4ce157692cdb0afe9f9' 'SKIP' - '8e8bf635b2dbf24be1ecbf202f4b507301c545218e3d865f5d4c2ec3c5257bf4' + '90b857145f4a2281998ba4338de92d673bd939be5d5ccd32a2d34d6e19b17816' '3b5cfc9ca9cf778ea2c4b619b933cda26519969df2d764b5a687f63cf59974cd' 'c175fbb141c3cec013c799f694d88310375ac5456042f6a4a1adc7667836d786' '8357f000b2b622e73dcfd41c2bad42b5e99fffe8f7ee64f774aa771f86cef43c' '5c1ee81fdd5818442af6081de987f9c1a9ce3c8d183566b3dfc19a8433aa3dde' - '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9' - '10801c245064777873b580bea1fc17a4288ec519e0ce9500aa1b7c6e19fe777b') + '067e8995fcd6f6ed25e0253e9374c0e179a000c154da3e59ce62634945ac5be9') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase Modified: config =================================================================== --- config 2022-11-03 17:37:53 UTC (rev 460499) +++ config 2022-11-03 17:49:14 UTC (rev 460500) @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.76 Kernel Configuration +# Linux/x86 5.15.77 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y
