Merge tag '4.20-rc5-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 (bc4caf18) · Commits · 戴 / test

fs/cifs/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ config CIFS_XATTR

		config CIFS_POSIX
		bool "CIFS POSIX Extensions"
		depends on CIFS_XATTR
		depends on CIFS && CIFS_ALLOW_INSECURE_LEGACY && CIFS_XATTR
		help
		Enabling this option will cause the cifs client to attempt to
		negotiate a newer dialect with servers, such as Samba 3.0.5

fs/cifs/dir.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ cifs_bp_rename_retry:

		cifs_dbg(FYI, "using cifs_sb prepath <%s>\n", cifs_sb->prepath);
		memcpy(full_path+dfsplen+1, cifs_sb->prepath, pplen-1);
		full_path[dfsplen] = '\\';
		full_path[dfsplen] = dirsep;
		for (i = 0; i < pplen-1; i++)
		if (full_path[dfsplen+1+i] == '/')
		full_path[dfsplen+1+i] = CIFS_DIR_SEP(cifs_sb);

fs/cifs/file.c

+6 −25

Original line number	Diff line number	Diff line
		@@ -2541,14 +2541,13 @@ static int
		cifs_resend_wdata(struct cifs_writedata wdata, struct list_head wdata_list,
		struct cifs_aio_ctx *ctx)
		{
		int wait_retry = 0;
		unsigned int wsize, credits;
		int rc;
		struct TCP_Server_Info *server =
		tlink_tcon(wdata->cfile->tlink)->ses->server;

		/*
		* Try to resend this wdata, waiting for credits up to 3 seconds.
		* Wait for credits to resend this wdata.
		* Note: we are attempting to resend the whole wdata not in segments
		*/
		do {
		@@ -2556,19 +2555,13 @@ cifs_resend_wdata(struct cifs_writedata wdata, struct list_head wdata_list,
		server, wdata->bytes, &wsize, &credits);

		if (rc)
		break;
		goto out;

		if (wsize < wdata->bytes) {
		add_credits_and_wake_if(server, credits, 0);
		msleep(1000);
		wait_retry++;
		}
		} while (wsize < wdata->bytes && wait_retry < 3);

		if (wsize < wdata->bytes) {
		rc = -EBUSY;
		goto out;
		}
		} while (wsize < wdata->bytes);

		rc = -EAGAIN;
		while (rc == -EAGAIN) {
		@@ -3234,14 +3227,13 @@ static int cifs_resend_rdata(struct cifs_readdata *rdata,
		struct list_head *rdata_list,
		struct cifs_aio_ctx *ctx)
		{
		int wait_retry = 0;
		unsigned int rsize, credits;
		int rc;
		struct TCP_Server_Info *server =
		tlink_tcon(rdata->cfile->tlink)->ses->server;

		/*
		* Try to resend this rdata, waiting for credits up to 3 seconds.
		* Wait for credits to resend this rdata.
		* Note: we are attempting to resend the whole rdata not in segments
		*/
		do {
		@@ -3249,24 +3241,13 @@ static int cifs_resend_rdata(struct cifs_readdata *rdata,
		&rsize, &credits);

		if (rc)
		break;
		goto out;

		if (rsize < rdata->bytes) {
		add_credits_and_wake_if(server, credits, 0);
		msleep(1000);
		wait_retry++;
		}
		} while (rsize < rdata->bytes && wait_retry < 3);

		/*
		* If we can't find enough credits to send this rdata
		* release the rdata and return failure, this will pass
		* whatever I/O amount we have finished to VFS.
		*/
		if (rsize < rdata->bytes) {
		rc = -EBUSY;
		goto out;
		}
		} while (rsize < rdata->bytes);

		rc = -EAGAIN;
		while (rc == -EAGAIN) {

Admin message