From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 12 Jun 2014 04:27:11 +0000 (-0400)
Subject: Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c1d5284c79fea050f115eadeec1dd1758e5c630;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus

Backmerge of dcache.c changes from mainline.  It's that, or complete
rebase...

Conflicts:
	fs/splice.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

9c1d5284c79fea050f115eadeec1dd1758e5c630
diff --cc fs/splice.c
index 8e7eef755a9b,e246954ea48c..f5cb9ba84510
--- a/fs/splice.c
+++ b/fs/splice.c
@@@ -1557,9 -1546,10 +1557,10 @@@ static long vmsplice_to_user(struct fil
  	ret = rw_copy_check_uvector(READ, uiov, nr_segs,
  				    ARRAY_SIZE(iovstack), iovstack, &iov);
  	if (ret <= 0)
- 		return ret;
+ 		goto out;
  
+ 	count = ret;
 -	iov_iter_init(&iter, iov, nr_segs, count, 0);
 +	iov_iter_init(&iter, READ, iov, nr_segs, count);
  
  	sd.len = 0;
  	sd.total_len = count;