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

Commit 7d1419f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs/smb3 fixes from Steve French:
 "Fix for CIFS/SMB3 oops on reconnect during readpages (3.17 regression)
  and for incorrectly closing file handle in symlink error cases"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix readpages retrying on reconnects
  Fix problem recognizing symlinks
parents ee042ec8 1209bbdf

fs/cifs/file.c

+1 −7
Original line number Diff line number Diff line
@@ -3568,15 +3568,9 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, 
				lru_cache_add_file(page);

				unlock_page(page);

				page_cache_release(page);

				if (rc == -EAGAIN)

					list_add_tail(&page->lru, &tmplist);

			}

			/* Fallback to the readpage in error/reconnect cases */

			kref_put(&rdata->refcount, cifs_readdata_release);

			if (rc == -EAGAIN) {

				/* Re-add pages to the page_list and retry */

				list_splice(&tmplist, page_list);

				continue;

			}

			break;

		}

fs/cifs/smb1ops.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, 
		tmprc = CIFS_open(xid, &oparms, &oplock, NULL);

		if (tmprc == -EOPNOTSUPP)

			*symlink = true;

		else

		else if (tmprc == 0)

			CIFSSMBClose(xid, tcon, fid.netfid);

	}

fs/cifs/smb2maperror.c

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = { 
	{STATUS_DLL_MIGHT_BE_INCOMPATIBLE, -EIO,

	"STATUS_DLL_MIGHT_BE_INCOMPATIBLE"},

	{STATUS_STOPPED_ON_SYMLINK, -EOPNOTSUPP, "STATUS_STOPPED_ON_SYMLINK"},

	{STATUS_IO_REPARSE_TAG_NOT_HANDLED, -EOPNOTSUPP,

	"STATUS_REPARSE_NOT_HANDLED"},

	{STATUS_DEVICE_REQUIRES_CLEANING, -EIO,

	"STATUS_DEVICE_REQUIRES_CLEANING"},

	{STATUS_DEVICE_DOOR_OPEN, -EIO, "STATUS_DEVICE_DOOR_OPEN"},