From: Nick <nick@khadas.com>
Date: Tue, 21 May 2019 09:54:57 +0000 (+0800)
Subject: Merge tag 'v4.9.170' into khadas-vim3-4.9.y
X-Git-Tag: khadas-vims-v0.9.6-release~644
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e0a9ded9d6ea014642d0963246c8f9a984ac1cb;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'v4.9.170' into khadas-vim3-4.9.y

This is the 4.9.170 stable release

 Conflicts:
	fs/ext4/ioctl.c
---

1e0a9ded9d6ea014642d0963246c8f9a984ac1cb
diff --cc fs/ext4/ioctl.c
index 4bc35e6,2ce7328..d116ea8
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@@ -753,8 -749,12 +753,14 @@@ resizefs_out
  		if (!blk_queue_discard(q))
  			return -EOPNOTSUPP;
  
 +		if ((flags & BLKDEV_DISCARD_SECURE) && !blk_queue_secure_erase(q))
 +			return -EOPNOTSUPP;
+ 		/*
+ 		 * We haven't replayed the journal, so we cannot use our
+ 		 * block-bitmap-guided storage zapping commands.
+ 		 */
+ 		if (test_opt(sb, NOLOAD) && ext4_has_feature_journal(sb))
+ 			return -EROFS;
  
  		if (copy_from_user(&range, (struct fstrim_range __user *)arg,
  		    sizeof(range)))