]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 May 2016 05:22:20 +0000 (22:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 May 2016 05:22:20 +0000 (22:22 -0700)
added patches:
btrfs-don-t-use-src-fd-for-printk.patch

queue-4.4/btrfs-don-t-use-src-fd-for-printk.patch [new file with mode: 0644]

diff --git a/queue-4.4/btrfs-don-t-use-src-fd-for-printk.patch b/queue-4.4/btrfs-don-t-use-src-fd-for-printk.patch
new file mode 100644 (file)
index 0000000..1c1352d
--- /dev/null
@@ -0,0 +1,33 @@
+From c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <jbacik@fb.com>
+Date: Fri, 25 Mar 2016 10:02:41 -0400
+Subject: Btrfs: don't use src fd for printk
+
+From: Josef Bacik <jbacik@fb.com>
+
+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 <jbacik@fb.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Cc: Jeff Mahoney <jeffm@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/btrfs/ioctl.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/btrfs/ioctl.c
++++ b/fs/btrfs/ioctl.c
+@@ -1648,7 +1648,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 = -EXDEV;
+               } else if (!inode_owner_or_capable(src_inode)) {