fxed smb cache build

				(char *)&cfid->file_all_info))

		cfid->file_all_info_is_valid = true;

	if (!npath[0])

		dentry = dget(cifs_sb->root);

	else {

		dentry = path_to_dentry(cifs_sb, npath);

		if (IS_ERR(dentry)) {

			rc = -ENOENT;

			goto oshr_free;

		}

	}

	cfid->dentry = dentry;

	cfid->time = jiffies;

	cfid->has_lease = true;

	spin_unlock(&cfids->cfid_list_lock);

	/* At this point the directory handle is fully cached */

	rc = 0;

oshr_free:

	kfree(utf16_path);

	SMB2_open_free(&rqst[0]);

	SMB2_query_info_free(&rqst[1]);

	free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base);

	free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);

	spin_lock(&cfids->cfid_list_lock);

	if (rc && !cfid->has_lease) {

		if (cfid->on_list) {

			list_del(&cfid->entry);

			cfid->on_list = false;

			cfids->num_entries--;

		}

		rc = -ENOENT;

	}

	spin_unlock(&cfids->cfid_list_lock);

	if (!rc && !cfid->has_lease) {

+	if (rc) {

+		spin_lock(&cfids->cfid_list_lock);

+		if (cfid->on_list) {

+			list_del(&cfid->entry);

+			cfid->on_list = false;

+			cfids->num_entries--;

+		}

+		if (cfid->has_lease) {

			/*

		 * We are guaranteed to have two references at this point.

		 * One for the caller and one for a potential lease.

		 * Release the Lease-ref so that the directory will be closed

		 * when the caller closes the cached handle.

			 * We are guaranteed to have two references at this

			 * point. One for the caller and one for a potential

			 * lease. Release the Lease-ref so that the directory

			 * will be closed when the caller closes the cached

			 * handle.

			 */

			cfid->has_lease = false;

			spin_unlock(&cfids->cfid_list_lock);

			kref_put(&cfid->refcount, smb2_close_cached_fid);

			goto out;

		}

		spin_unlock(&cfids->cfid_list_lock);

	}

out:

	if (rc) {

		if (cfid->is_open)

			SMB2_close(0, cfid->tcon, cfid->fid.persistent_fid,

				   cfid->fid.volatile_fid);

		free_cached_dir(cfid);

		cfid = NULL;

	}

	if (rc == 0) {

	} else {

		*ret_cfid = cfid;

		atomic_inc(&tcon->num_remote_opens);

	}

	kfree(utf16_path);

	return rc;

}

--- fs/smb/client/cached_dir.c

+++ fs/smb/client/cached_dir.c

@@ -324,37 +359,24 @@ int open_cached_dir(unsigned int xid, struct cifs_tcon *tcon,

 				(char *)&cfid->file_all_info))

 		cfid->file_all_info_is_valid = true;

-	if (!npath[0])

-		dentry = dget(cifs_sb->root);

-	else {

-		dentry = path_to_dentry(cifs_sb, npath);

-		if (IS_ERR(dentry)) {

-			rc = -ENOENT;

-			goto oshr_free;

-		}

-	}

-	spin_lock(&cfids->cfid_list_lock);

-	cfid->dentry = dentry;

 	cfid->time = jiffies;

-	cfid->has_lease = true;

 	spin_unlock(&cfids->cfid_list_lock);

+	/* At this point the directory handle is fully cached */

+	rc = 0;

 oshr_free:

-	kfree(utf16_path);

 	SMB2_open_free(&rqst[0]);

 	SMB2_query_info_free(&rqst[1]);

 	free_rsp_buf(resp_buftype[0], rsp_iov[0].iov_base);

 	free_rsp_buf(resp_buftype[1], rsp_iov[1].iov_base);

-	spin_lock(&cfids->cfid_list_lock);

-	if (!cfid->has_lease) {

-		if (rc) {

-			if (cfid->on_list) {

-				list_del(&cfid->entry);

-				cfid->on_list = false;

-				cfids->num_entries--;

-			}

-			rc = -ENOENT;

-		} else {

+	if (rc) {

+		spin_lock(&cfids->cfid_list_lock);

+		if (cfid->on_list) {

+			list_del(&cfid->entry);

+			cfid->on_list = false;

+			cfids->num_entries--;

+		}

+		if (cfid->has_lease) {

 			/*

 			 * We are guaranteed to have two references at this

 			 * point. One for the caller and one for a potential

@@ -362,25 +384,24 @@ oshr_free:

 			 * will be closed when the caller closes the cached

 			 * handle.

 			 */

+			cfid->has_lease = false;

 			spin_unlock(&cfids->cfid_list_lock);

 			kref_put(&cfid->refcount, smb2_close_cached_fid);

 			goto out;

 		}

+		spin_unlock(&cfids->cfid_list_lock);

 	}

-	spin_unlock(&cfids->cfid_list_lock);

+out:

 	if (rc) {

 		if (cfid->is_open)

 			SMB2_close(0, cfid->tcon, cfid->fid.persistent_fid,

 				   cfid->fid.volatile_fid);

 		free_cached_dir(cfid);

-		cfid = NULL;

-	}

-out:

-	if (rc == 0) {

+	} else {

 		*ret_cfid = cfid;

 		atomic_inc(&tcon->num_remote_opens);

 	}

-

+	kfree(utf16_path);

 	return rc;

 }