Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4b8f657 authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French
Browse files

CIFS: Move open file handling to writepages 



Currently we check for an open file existence in wdata_send_pages()
which doesn't provide an easy way to handle error codes that will
be returned from find_writable_filehandle() once it is changed.
Move the check to writepages.

Signed-off-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 258f0603

fs/cifs/file.c

+14 −15
Original line number Diff line number Diff line
@@ -2076,11 +2076,12 @@ wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages, 
}



static int

wdata_send_pages(struct TCP_Server_Info *server, struct cifs_writedata *wdata,

		 unsigned int nr_pages, struct address_space *mapping,

		 struct writeback_control *wbc)

wdata_send_pages(struct cifs_writedata *wdata, unsigned int nr_pages,

		 struct address_space *mapping, struct writeback_control *wbc)

{

	int rc;

	struct TCP_Server_Info *server =

				tlink_tcon(wdata->cfile->tlink)->ses->server;



	wdata->sync_mode = wbc->sync_mode;

	wdata->nr_pages = nr_pages;
@@ -2090,22 +2091,16 @@ wdata_send_pages(struct TCP_Server_Info *server, struct cifs_writedata *wdata, 
			page_offset(wdata->pages[nr_pages - 1]),

			(loff_t)PAGE_SIZE);

	wdata->bytes = ((nr_pages - 1) * PAGE_SIZE) + wdata->tailsz;

	wdata->pid = wdata->cfile->pid;



	rc = adjust_credits(server, &wdata->credits, wdata->bytes);

	if (rc)

		return rc;



	if (!wdata->cfile) {

		cifs_dbg(VFS, "No writable handle in writepages\n");

		rc = -EBADF;

	} else {

		wdata->pid = wdata->cfile->pid;

	if (wdata->cfile->invalidHandle)

		rc = -EAGAIN;

	else

			rc = server->ops->async_writev(wdata,

						       cifs_writedata_release);

	}

		rc = server->ops->async_writev(wdata, cifs_writedata_release);



	return rc;

}
@@ -2193,7 +2188,11 @@ static int cifs_writepages(struct address_space *mapping, 
		wdata->cfile = cfile;

		cfile = NULL;



		rc = wdata_send_pages(server, wdata, nr_pages, mapping, wbc);

		if (!wdata->cfile) {

			cifs_dbg(VFS, "No writable handle in writepages\n");

			rc = -EBADF;

		} else

			rc = wdata_send_pages(wdata, nr_pages, mapping, wbc);



		for (i = 0; i < nr_pages; ++i)

			unlock_page(wdata->pages[i]);