linux-next: manual merge of the vfs tree with Linus' tree

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in fs/cifs/file.c
between commit c11f1df5003d ("cifs: Wait for writebacks to complete
before attempting write") from Linus' tree and commit 30b11990262e
("cifs: switch to ->write_iter()") from the vfs tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc fs/cifs/file.c
index 5ed03e0b8b40,bd6c36d005f3..000000000000
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@@ -2628,13 -2620,9 +2624,12 @@@ cifs_strict_writev(struct kiocb *iocb, 
        if (CIFS_CACHE_WRITE(cinode)) {
                if (cap_unix(tcon->ses) &&
                (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))
 -                  && ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
 -                      return generic_file_write_iter(iocb, from);
 -              return cifs_writev(iocb, from);
 +                && ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0)) {
-                       written = generic_file_aio_write(
-                                       iocb, iov, nr_segs, pos);
++                      written = generic_file_write_iter(iocb, from);
 +                      goto out;
 +              }
-               written = cifs_writev(iocb, iov, nr_segs, pos);
++              written = cifs_writev(iocb, from);
 +              goto out;
        }
        /*
         * For non-oplocked files in strict cache mode we need to write the data

pgpKpiWx3fKO8.pgp
Description: PGP signature