On Tue, 2016-05-17 at 09:36 -0400, Jeff Mahoney wrote: > From: Josef Bacik <jbacik@xxxxxx> > > [ Upstream commit c79b4713304f812d3d6c95826fc3e5fc2c0b0c14 ] > > 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@xxxxxx> > Reviewed-by: David Sterba <dsterba@xxxxxxxx> > Signed-off-by: David Sterba <dsterba@xxxxxxxx> > Cc: stable@xxxxxxxxxxxxxxx # 3.14+ Belatedly queued up for 3.16, thanks. Ben. > --- > fs/btrfs/ioctl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index 053e677..21423dd 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -1654,7 +1654,7 @@ static noinline int btrfs_ioctl_snap_create_transid(struct file *file, > > 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)) { > > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Ben Hutchings compatible: Gracefully accepts erroneous data from any source
Attachment:
signature.asc
Description: This is a digitally signed message part