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

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

CIFS: Reconnect durable handles for SMB2 



On reconnects, we need to reopen file and then obtain all byte-range
locks held by the client. SMB2 protocol provides feature to make
this process atomic by reconnecting to the same file handle
with all it's byte-range locks. This patch adds this capability
for SMB2 shares.

Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: default avatarSteven French <steven@steven-GA-970A-DS3.(none)>
parent 064f6047

fs/cifs/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ struct cifs_open_parms { 
	int create_options;

	const char *path;

	struct cifs_fid *fid;

	bool reconnect:1;

};



struct cifs_fid {

fs/cifs/dir.c

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, 
	oparms.disposition = disposition;

	oparms.path = full_path;

	oparms.fid = fid;

	oparms.reconnect = false;



	rc = server->ops->open(xid, &oparms, oplock, buf);

	if (rc) {

fs/cifs/file.c

+9 −6
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, 
	oparms.disposition = disposition;

	oparms.path = full_path;

	oparms.fid = fid;

	oparms.reconnect = false;



	rc = server->ops->open(xid, &oparms, oplock, buf);
@@ -594,7 +595,6 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
	int desired_access;

	int disposition = FILE_OPEN;

	int create_options = CREATE_NOT_DIR;

	struct cifs_fid fid;

	struct cifs_open_parms oparms;



	xid = get_xid();
@@ -645,7 +645,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 


		rc = cifs_posix_open(full_path, NULL, inode->i_sb,

				     cifs_sb->mnt_file_mode /* ignored */,

				     oflags, &oplock, &fid.netfid, xid);

				     oflags, &oplock, &cfile->fid.netfid, xid);

		if (rc == 0) {

			cifs_dbg(FYI, "posix reopen succeeded\n");

			goto reopen_success;
@@ -662,7 +662,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
		create_options |= CREATE_OPEN_BACKUP_INTENT;



	if (server->ops->get_lease_key)

		server->ops->get_lease_key(inode, &fid);

		server->ops->get_lease_key(inode, &cfile->fid);



	oparms.tcon = tcon;

	oparms.cifs_sb = cifs_sb;
@@ -670,7 +670,8 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
	oparms.create_options = create_options;

	oparms.disposition = disposition;

	oparms.path = full_path;

	oparms.fid = &fid;

	oparms.fid = &cfile->fid;

	oparms.reconnect = true;



	/*

	 * Can not refresh inode by passing in file_info buf to be returned by
@@ -710,7 +711,8 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) 
	 * to the server to get the new inode info.

	 */



	server->ops->set_fid(cfile, &fid, oplock);

	server->ops->set_fid(cfile, &cfile->fid, oplock);

	if (oparms.reconnect)

		cifs_relock_file(cfile);



reopen_error_exit:
@@ -1508,6 +1510,7 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type, 
		if (!rc)

			goto out;





		/*

		 * Windows 7 server can delay breaking lease from read to None

		 * if we set a byte-range lock on a file - break it explicitly

fs/cifs/smb2file.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ smb2_set_oplock_level(struct cifsInodeInfo *cinode, __u32 oplock) 
	oplock &= 0xFF;

	if (oplock == SMB2_OPLOCK_LEVEL_NOCHANGE)

		return;

	if (oplock == SMB2_OPLOCK_LEVEL_EXCLUSIVE) {

	if (oplock == SMB2_OPLOCK_LEVEL_EXCLUSIVE ||

	    oplock == SMB2_OPLOCK_LEVEL_BATCH) {

		cinode->clientCanCacheAll = true;

		cinode->clientCanCacheRead = true;

		cifs_dbg(FYI, "Exclusive Oplock granted on inode %p\n",

fs/cifs/smb2inode.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ smb2_open_op_close(const unsigned int xid, struct cifs_tcon *tcon, 
	oparms.disposition = create_disposition;

	oparms.create_options = create_options;

	oparms.fid = &fid;

	oparms.reconnect = false;



	rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL);

	if (rc) {