From: Greg Kroah-Hartman Date: Mon, 7 Nov 2022 12:29:15 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.9.333~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdfccf163d35f24e509c9fc5642a38643078fa0e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: btrfs-fix-type-of-parameter-generation-in-btrfs_get_dentry.patch --- diff --git a/queue-4.14/btrfs-fix-type-of-parameter-generation-in-btrfs_get_dentry.patch b/queue-4.14/btrfs-fix-type-of-parameter-generation-in-btrfs_get_dentry.patch new file mode 100644 index 00000000000..22487109dce --- /dev/null +++ b/queue-4.14/btrfs-fix-type-of-parameter-generation-in-btrfs_get_dentry.patch @@ -0,0 +1,44 @@ +From 2398091f9c2c8e0040f4f9928666787a3e8108a7 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Tue, 18 Oct 2022 16:05:52 +0200 +Subject: btrfs: fix type of parameter generation in btrfs_get_dentry + +From: David Sterba + +commit 2398091f9c2c8e0040f4f9928666787a3e8108a7 upstream. + +The type of parameter generation has been u32 since the beginning, +however all callers pass a u64 generation, so unify the types to prevent +potential loss. + +CC: stable@vger.kernel.org # 4.9+ +Reviewed-by: Josef Bacik +Signed-off-by: David Sterba +Signed-off-by: Greg Kroah-Hartman +--- + fs/btrfs/export.c | 2 +- + fs/btrfs/export.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/fs/btrfs/export.c ++++ b/fs/btrfs/export.c +@@ -57,7 +57,7 @@ static int btrfs_encode_fh(struct inode + } + + struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, +- u64 root_objectid, u32 generation, ++ u64 root_objectid, u64 generation, + int check_generation) + { + struct btrfs_fs_info *fs_info = btrfs_sb(sb); +--- a/fs/btrfs/export.h ++++ b/fs/btrfs/export.h +@@ -18,7 +18,7 @@ struct btrfs_fid { + } __attribute__ ((packed)); + + struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, +- u64 root_objectid, u32 generation, ++ u64 root_objectid, u64 generation, + int check_generation); + struct dentry *btrfs_get_parent(struct dentry *child); + diff --git a/queue-4.14/series b/queue-4.14/series index fa26152ef7a..1c84a295c99 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -22,3 +22,4 @@ media-dvb-frontends-drxk-initialize-err-to-0.patch i2c-xiic-add-platform-module-alias.patch bluetooth-l2cap-fix-attempting-to-access-uninitialized-memory.patch block-bfq-protect-bfqd-queued-by-bfqd-lock.patch +btrfs-fix-type-of-parameter-generation-in-btrfs_get_dentry.patch