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

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

CIFS: Find and reopen a file before get MTU credits in writepages 



Reorder finding and reopening a writable handle file and getting
MTU credits in writepages because we may be stuck on low credits
otherwise.

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

fs/cifs/file.c

+18 −6
Original line number Original line Diff line number Diff line
@@ -2096,15 +2096,16 @@ wdata_send_pages(struct TCP_Server_Info *server, struct cifs_writedata *wdata, 
	if (rc)

	if (rc)

		goto send_pages_out;

		goto send_pages_out;





	if (wdata->cfile != NULL)

		cifsFileInfo_put(wdata->cfile);

	wdata->cfile = find_writable_file(CIFS_I(mapping->host), false);

	if (!wdata->cfile) {

	if (!wdata->cfile) {

		cifs_dbg(VFS, "No writable handles for inode\n");

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

		rc = -EBADF;

		rc = -EBADF;

	} else {

	} else {

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

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

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

		if (wdata->cfile->invalidHandle)

			rc = -EAGAIN;

		else

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

						       cifs_writedata_release);

	}

	}





send_pages_out:

send_pages_out:
@@ -2117,11 +2118,13 @@ wdata_send_pages(struct TCP_Server_Info *server, struct cifs_writedata *wdata, 
static int cifs_writepages(struct address_space *mapping,

static int cifs_writepages(struct address_space *mapping,

			   struct writeback_control *wbc)

			   struct writeback_control *wbc)

{

{

	struct cifs_sb_info *cifs_sb = CIFS_SB(mapping->host->i_sb);

	struct inode *inode = mapping->host;

	struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);

	struct TCP_Server_Info *server;

	struct TCP_Server_Info *server;

	bool done = false, scanned = false, range_whole = false;

	bool done = false, scanned = false, range_whole = false;

	pgoff_t end, index;

	pgoff_t end, index;

	struct cifs_writedata *wdata;

	struct cifs_writedata *wdata;

	struct cifsFileInfo *cfile = NULL;

	int rc = 0;

	int rc = 0;

	int saved_rc = 0;

	int saved_rc = 0;

	unsigned int xid;

	unsigned int xid;
@@ -2152,6 +2155,11 @@ static int cifs_writepages(struct address_space *mapping, 
		struct cifs_credits credits_on_stack;

		struct cifs_credits credits_on_stack;

		struct cifs_credits *credits = &credits_on_stack;

		struct cifs_credits *credits = &credits_on_stack;





		if (cfile)

			cifsFileInfo_put(cfile);



		cfile = find_writable_file(CIFS_I(inode), false);



		rc = server->ops->wait_mtu_credits(server, cifs_sb->wsize,

		rc = server->ops->wait_mtu_credits(server, cifs_sb->wsize,

						   &wsize, credits);

						   &wsize, credits);

		if (rc != 0) {

		if (rc != 0) {
@@ -2187,6 +2195,8 @@ static int cifs_writepages(struct address_space *mapping, 
		}

		}





		wdata->credits = credits_on_stack;

		wdata->credits = credits_on_stack;

		wdata->cfile = cfile;

		cfile = NULL;





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

		rc = wdata_send_pages(server, wdata, nr_pages, mapping, wbc);
@@ -2244,6 +2254,8 @@ static int cifs_writepages(struct address_space *mapping, 
	if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))

	if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))

		mapping->writeback_index = index;

		mapping->writeback_index = index;





	if (cfile)

		cifsFileInfo_put(cfile);

	free_xid(xid);

	free_xid(xid);

	return rc;

	return rc;

}

}