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>

diff --cc fs/afs/internal.h
Simple merge

diff --cc fs/splice.c
index 8e7eef7,e246954..f5cb9ba
--- 1/fs/splice.c
--- 2/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;
  
 -      iov_iter_init(&iter, iov, nr_segs, count, 0);
+       count = ret;
 +      iov_iter_init(&iter, READ, iov, nr_segs, count);
  
        sd.len = 0;
        sd.total_len = count;

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc mm/filemap.c
Simple merge