From 0e70568bc0e944dd0d10ead3686283c6fcb483db Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 May 2016 22:22:17 -0700 Subject: [PATCH] 3.14-stable patches added patches: btrfs-don-t-use-src-fd-for-printk.patch --- .../btrfs-don-t-use-src-fd-for-printk.patch | 33 +++++++++++++++++++ queue-3.14/series | 1 + queue-4.4/series | 1 + queue-4.5/series | 0 4 files changed, 35 insertions(+) create mode 100644 queue-3.14/btrfs-don-t-use-src-fd-for-printk.patch create mode 100644 queue-3.14/series create mode 100644 queue-4.4/series create mode 100644 queue-4.5/series diff --git a/queue-3.14/btrfs-don-t-use-src-fd-for-printk.patch b/queue-3.14/btrfs-don-t-use-src-fd-for-printk.patch new file mode 100644 index 00000000000..6bceb98ae2f --- /dev/null +++ b/queue-3.14/btrfs-don-t-use-src-fd-for-printk.patch @@ -0,0 +1,33 @@ +From c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 Mon Sep 17 00:00:00 2001 +From: Josef Bacik +Date: Fri, 25 Mar 2016 10:02:41 -0400 +Subject: Btrfs: don't use src fd for printk + +From: Josef Bacik + +commit c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 upstream. + +The fd we pass in may not be on a btrfs file system, so don't try to do +BTRFS_I() on it. Thanks, + +Signed-off-by: Josef Bacik +Reviewed-by: David Sterba +Signed-off-by: David Sterba +Cc: Jeff Mahoney +Signed-off-by: Greg Kroah-Hartman + +--- + fs/btrfs/ioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/btrfs/ioctl.c ++++ b/fs/btrfs/ioctl.c +@@ -1574,7 +1574,7 @@ static noinline int btrfs_ioctl_snap_cre + + src_inode = file_inode(src.file); + if (src_inode->i_sb != file_inode(file)->i_sb) { +- btrfs_info(BTRFS_I(src_inode)->root->fs_info, ++ btrfs_info(BTRFS_I(file_inode(file))->root->fs_info, + "Snapshot src from another FS"); + ret = -EINVAL; + } else if (!inode_owner_or_capable(src_inode)) { diff --git a/queue-3.14/series b/queue-3.14/series new file mode 100644 index 00000000000..19ebce93146 --- /dev/null +++ b/queue-3.14/series @@ -0,0 +1 @@ +btrfs-don-t-use-src-fd-for-printk.patch diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..19ebce93146 --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1 @@ +btrfs-don-t-use-src-fd-for-printk.patch diff --git a/queue-4.5/series b/queue-4.5/series new file mode 100644 index 00000000000..e69de29bb2d -- 2.47.3