Merge 4.14.147 into android-4.14-q

author Greg Kroah-Hartman <gregkh@google.com>

Sun, 6 Oct 2019 10:38:20 +0000 (12:38 +0200)

committer Greg Kroah-Hartman <gregkh@google.com>

Sun, 6 Oct 2019 10:38:20 +0000 (12:38 +0200)
author Greg Kroah-Hartman <gregkh@google.com>
Sun, 6 Oct 2019 10:38:20 +0000 (12:38 +0200)
committer Greg Kroah-Hartman <gregkh@google.com>
Sun, 6 Oct 2019 10:38:20 +0000 (12:38 +0200)
diff --cc Makefile
Simple merge
diff --cc arch/arm64/kernel/cpufeature.c
Simple merge
diff --cc arch/x86/Makefile
Simple merge
diff --cc drivers/md/md.c
Simple merge
diff --cc drivers/net/ppp/ppp_generic.c
Simple merge
diff --cc drivers/power/supply/power_supply_sysfs.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/f2fs/checkpoint.c

index 5029480e69f793506639bed571ec176f19a80612,170423ff272103aa6ca83549df09acf1f324c383..28739c0034b1b1f38c11351db998e0ac75e4ec78
--- 1/fs/f2fs/checkpoint.c
--- 2/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@@ -842,9 -793,9 +842,10 @@@ int f2fs_get_valid_checkpoint(struct f2
         unsigned int cp_blks = 1 + __cp_payload(sbi);
         block_t cp_blk_no;
         int i;
+       int err;
   
- -      sbi->ckpt = kzalloc(cp_blks * blk_size, GFP_KERNEL);
+ +      sbi->ckpt = f2fs_kzalloc(sbi, array_size(blk_size, cp_blks),
+ +                               GFP_KERNEL);
         if (!sbi->ckpt)
                 return -ENOMEM;
         /*
@@@ -881,8 -833,10 +883,10 @@@
                 sbi->cur_cp_pack = 2;
   
         /* Sanity checking of checkpoint */
-       if (f2fs_sanity_check_ckpt(sbi))
- -      if (sanity_check_ckpt(sbi)) {
++      if (f2fs_sanity_check_ckpt(sbi)) {
+               err = -EFSCORRUPTED;
                 goto free_fail_no_cp;
+       }
   
         if (cp_blks <= 1)
                 goto done;
@@@ -911,8 -863,8 +915,8 @@@ free_fail_no_cp
         f2fs_put_page(cp1, 1);
         f2fs_put_page(cp2, 1);
   fail_no_cp:
- -      kfree(sbi->ckpt);
+ +      kvfree(sbi->ckpt);
-       return -EINVAL;
+       return err;
   }
   
   static void __add_dirty_inode(struct inode *inode, enum inode_type type)
diff --cc fs/f2fs/data.c
Simple merge
diff --cc fs/f2fs/f2fs.h

index d0df6e9396b78da02bc2abdb7c99ecf56a8a638c,268409cee1c348ab016e35f386b679d969167e27..0ae019b79e0c4a20b66277558b9a7a9ade8a19a3
--- 1/fs/f2fs/f2fs.h
--- 2/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@@ -3612,70 -3088,8 +3612,74 @@@ static inline bool f2fs_may_encrypt(str
   #endif
   }
   
+ +static inline int block_unaligned_IO(struct inode *inode,
+ +                              struct kiocb *iocb, struct iov_iter *iter)
+ +{
+ +      unsigned int i_blkbits = READ_ONCE(inode->i_blkbits);
+ +      unsigned int blocksize_mask = (1 << i_blkbits) - 1;
+ +      loff_t offset = iocb->ki_pos;
+ +      unsigned long align = offset | iov_iter_alignment(iter);
+ +
+ +      return align & blocksize_mask;
+ +}
+ +
+ +static inline int allow_outplace_dio(struct inode *inode,
+ +                              struct kiocb *iocb, struct iov_iter *iter)
+ +{
+ +      struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+ +      int rw = iov_iter_rw(iter);
+ +
+ +      return (test_opt(sbi, LFS) && (rw == WRITE) &&
+ +                              !block_unaligned_IO(inode, iocb, iter));
+ +}
+ +
+ +static inline bool f2fs_force_buffered_io(struct inode *inode,
+ +                              struct kiocb *iocb, struct iov_iter *iter)
+ +{
+ +      struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+ +      int rw = iov_iter_rw(iter);
+ +
+ +      if (f2fs_post_read_required(inode))
+ +              return true;
+ +      if (sbi->s_ndevs)
+ +              return true;
+ +      /*
+ +       * for blkzoned device, fallback direct IO to buffered IO, so
+ +       * all IOs can be serialized by log-structured write.
+ +       */
+ +      if (f2fs_sb_has_blkzoned(sbi))
+ +              return true;
+ +      if (test_opt(sbi, LFS) && (rw == WRITE) &&
+ +                              block_unaligned_IO(inode, iocb, iter))
+ +              return true;
+ +      if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED))
+ +              return true;
+ +
+ +      return false;
+ +}
+ +
+ +#ifdef CONFIG_F2FS_FAULT_INJECTION
+ +extern void f2fs_build_fault_attr(struct f2fs_sb_info *sbi, unsigned int rate,
+ +                                                      unsigned int type);
+ +#else
+ +#define f2fs_build_fault_attr(sbi, rate, type)                do { } while (0)
+ +#endif
+ +
+ +static inline bool is_journalled_quota(struct f2fs_sb_info *sbi)
+ +{
+ +#ifdef CONFIG_QUOTA
+ +      if (f2fs_sb_has_quota_ino(sbi))
+ +              return true;
+ +      if (F2FS_OPTION(sbi).s_qf_names[USRQUOTA] ||
+ +              F2FS_OPTION(sbi).s_qf_names[GRPQUOTA] ||
+ +              F2FS_OPTION(sbi).s_qf_names[PRJQUOTA])
+ +              return true;
+ +#endif
+ +      return false;
+ +}
+ +
   #endif
+ 
+ #define EFSBADCRC     EBADMSG         /* Bad CRC detected */
+ #define EFSCORRUPTED  EUCLEAN         /* Filesystem is corrupted */
+ 
diff --cc fs/f2fs/inline.c
Simple merge
diff --cc fs/f2fs/inode.c

index 3cb80e6e31283337d1b94a22805bf49560162ad5,c6d0687f00fee6bc62ad3b811aa046cb944e4838..e9cd54afd14a5069118e2b6051c123fa3cf28986
--- 1/fs/f2fs/inode.c
--- 2/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@@ -355,25 -298,9 +355,25 @@@ static int do_read_inode(struct inode *
         fi->i_extra_isize = f2fs_has_extra_attr(inode) ?
                                         le16_to_cpu(ri->i_extra_isize) : 0;
   
+ +      if (f2fs_sb_has_flexible_inline_xattr(sbi)) {
+ +              fi->i_inline_xattr_size = le16_to_cpu(ri->i_inline_xattr_size);
+ +      } else if (f2fs_has_inline_xattr(inode) ||
+ +                              f2fs_has_inline_dentry(inode)) {
+ +              fi->i_inline_xattr_size = DEFAULT_INLINE_XATTR_ADDRS;
+ +      } else {
+ +
+ +              /*
+ +               * Previous inline data or directory always reserved 200 bytes
+ +               * in inode layout, even if inline_xattr is disabled. In order
+ +               * to keep inline_dentry's structure for backward compatibility,
+ +               * we get the space back only from inline_data.
+ +               */
+ +              fi->i_inline_xattr_size = 0;
+ +      }
+ +
         if (!sanity_check_inode(inode, node_page)) {
                 f2fs_put_page(node_page, 1);
-               return -EINVAL;
+               return -EFSCORRUPTED;
         }
   
         /* check data exist */
diff --cc fs/f2fs/node.c
Simple merge
diff --cc fs/f2fs/recovery.c
Simple merge
diff --cc fs/f2fs/segment.c

index 9fdcda50fb025a85e762223689c757296522d821,9e5fca35e47d07cf0efb6b3b802f8493929751ba..5a61cf42ef749b07b0f8a6125d317e55908fcc73
--- 1/fs/f2fs/segment.c
--- 2/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@@ -2774,7 -2216,8 +2774,7 @@@ int f2fs_trim_fs(struct f2fs_sb_info *s
         if (is_sbi_flag_set(sbi, SBI_NEED_FSCK)) {
                 f2fs_msg(sbi->sb, KERN_WARNING,
                         "Found FS corruption, run fsck to fix.");
-               return -EIO;
- -              err = -EFSCORRUPTED;
- -              goto out;
++              return -EFSCORRUPTED;
         }
   
         /* start/end segment number in main_area */
diff --cc fs/f2fs/segment.h
Simple merge
diff --cc fs/f2fs/super.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/overlayfs/inode.c
Simple merge
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/sched/fair.c
Simple merge
diff --cc mm/compaction.c
Simple merge
author	Greg Kroah-Hartman <gregkh@google.com>
	Sun, 6 Oct 2019 10:38:20 +0000 (12:38 +0200)
committer	Greg Kroah-Hartman <gregkh@google.com>
	Sun, 6 Oct 2019 10:38:20 +0000 (12:38 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/ppp/ppp_generic.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/power/supply/power_supply_sysfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/checkpoint.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/data.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/f2fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/inline.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/node.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/recovery.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/segment.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/segment.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/f2fs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/fuse/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/overlayfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/compaction.c	patch \|	diff1 \|	diff2 \|	blob \| history