Merge tag ‘arc-5.1-final’ of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc [Linux 5.1]

Merge tag ‘arc-5.1-final’ of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc [Linux 5.1]

This Linux kernel change "Merge tag ‘arc-5.1-final’ of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc" is included in the Linux 5.1 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Wed May 1 13:40:30 2019 -0700. The commit for this change in Linux stable tree is 65beea4 (patch). Other info about this change: Merge: fb0af61 55c0c4c

Merge tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fixes from Vineet Gupta:
 "A few minor fixes for ARC.

   - regression in memset if line size !64

   - avoid panic if PAE and IOC"

* tag 'arc-5.1-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: memset: fix build with L1_CACHE_SHIFT != 6
  ARC: [hsdk] Make it easier to add PAE40 region to DTB
  ARC: PAE40: don't panic and instead turn off hw ioc

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 fs/btrfs/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 82fdda8..2973608 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6783,7 +6783,7 @@ struct extent_map *btrfs_get_extent(struct btrfs_inode *inode,
    u64 extent_start = 0;
    u64 extent_end = 0;
    u64 objectid = btrfs_ino(inode);
-   u8 extent_type;
+   int extent_type = -1;
    struct btrfs_path *path = NULL;
    struct btrfs_root *root = inode->root;
    struct btrfs_file_extent_item *item;

Leave a Reply

Your email address will not be published. Required fields are marked *