FYI - merge conflict in current cifs-2.6.git for-next (and current mainline kernel) due to Al Viro's read_iter and write_iter changes. Presumably due to changeset https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/fs/cifs?id=16b9057804c02e2d351e9c8f606e909b43cbd9e7 Would you rebase on current cifs-2.6.git or current mainline from this patch on? On Mon, Jun 23, 2014 at 9:58 AM, Pavel Shilovsky <pshilovsky@xxxxxxxxx> wrote: > Signed-off-by: Pavel Shilovsky <pshilovsky@xxxxxxxxx> > --- > fs/cifs/file.c | 88 ++++++++++++++++++++++++++++++++------------------------ > 1 file changed, 50 insertions(+), 38 deletions(-) > > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > index e9dc57a..89d647b 100644 > --- a/fs/cifs/file.c > +++ b/fs/cifs/file.c > @@ -2423,12 +2423,59 @@ cifs_uncached_retry_writev(struct cifs_writedata *wdata) > return rc; > } > > +static int > +wdata_fill_from_iovec(struct cifs_writedata *wdata, struct iov_iter *it, > + size_t *len, unsigned long nr_pages) > +{ > + int rc = 0; > + size_t save_len, copied, bytes, cur_len = *len; > + unsigned long i; > + > + save_len = cur_len; > + for (i = 0; i < nr_pages; i++) { > + bytes = min_t(const size_t, cur_len, PAGE_SIZE); > + copied = iov_iter_copy_from_user(wdata->pages[i], it, > + 0, bytes); > + cur_len -= copied; > + iov_iter_advance(it, copied); > + /* > + * If we didn't copy as much as we expected, then that > + * may mean we trod into an unmapped area. Stop copying > + * at that point. On the next pass through the big > + * loop, we'll likely end up getting a zero-length > + * write and bailing out of it. > + */ > + if (copied < bytes) > + break; > + } > + cur_len = save_len - cur_len; > + *len = cur_len; > + > + /* > + * If we have no data to send, then that probably means that > + * the copy above failed altogether. That's most likely because > + * the address in the iovec was bogus. Return -EFAULT and let > + * the caller free anything we allocated and bail out. > + */ > + if (!cur_len) > + return -EFAULT; > + > + /* > + * i + 1 now represents the number of pages we actually used in > + * the copy phase above. Bring nr_pages down to that, and free > + * any pages that we didn't use. > + */ > + for ( ; nr_pages > i + 1; nr_pages--) > + put_page(wdata->pages[nr_pages - 1]); > + return rc; > +} > + > static ssize_t > cifs_iovec_write(struct file *file, const struct iovec *iov, > unsigned long nr_segs, loff_t *poffset) > { > unsigned long nr_pages, i; > - size_t bytes, copied, len, cur_len; > + size_t len, cur_len; > ssize_t total_written = 0; > loff_t offset; > struct iov_iter it; > @@ -2465,8 +2512,6 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, > > iov_iter_init(&it, iov, nr_segs, len, 0); > do { > - size_t save_len; > - > nr_pages = get_numpages(cifs_sb->wsize, len, &cur_len); > wdata = cifs_writedata_alloc(nr_pages, > cifs_uncached_writev_complete); > @@ -2481,47 +2526,14 @@ cifs_iovec_write(struct file *file, const struct iovec *iov, > break; > } > > - save_len = cur_len; > - for (i = 0; i < nr_pages; i++) { > - bytes = min_t(const size_t, cur_len, PAGE_SIZE); > - copied = iov_iter_copy_from_user(wdata->pages[i], &it, > - 0, bytes); > - cur_len -= copied; > - iov_iter_advance(&it, copied); > - /* > - * If we didn't copy as much as we expected, then that > - * may mean we trod into an unmapped area. Stop copying > - * at that point. On the next pass through the big > - * loop, we'll likely end up getting a zero-length > - * write and bailing out of it. > - */ > - if (copied < bytes) > - break; > - } > - cur_len = save_len - cur_len; > - > - /* > - * If we have no data to send, then that probably means that > - * the copy above failed altogether. That's most likely because > - * the address in the iovec was bogus. Set the rc to -EFAULT, > - * free anything we allocated and bail out. > - */ > - if (!cur_len) { > + rc = wdata_fill_from_iovec(wdata, &it, &cur_len, nr_pages); > + if (rc) { > for (i = 0; i < nr_pages; i++) > put_page(wdata->pages[i]); > kfree(wdata); > - rc = -EFAULT; > break; > } > > - /* > - * i + 1 now represents the number of pages we actually used in > - * the copy phase above. Bring nr_pages down to that, and free > - * any pages that we didn't use. > - */ > - for ( ; nr_pages > i + 1; nr_pages--) > - put_page(wdata->pages[nr_pages - 1]); > - > wdata->sync_mode = WB_SYNC_ALL; > wdata->nr_pages = nr_pages; > wdata->offset = (__u64)offset; > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Thanks, Steve -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
