Commit 35866f3f authored by Rohith Surabattula's avatar Rohith Surabattula Committed by Steve French
Browse files

cifs: Not to defer close on file when lock is set 



Close file immediately when lock is set.

Cc: stable@vger.kernel.org # 5.13+
Signed-off-by: default avatarRohith Surabattula <rohiths@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 71826b06

fs/cifs/cifsglob.h

+1 −0
Original line number Diff line number Diff line
@@ -1399,6 +1399,7 @@ struct cifsInodeInfo { 
#define CIFS_INO_INVALID_MAPPING	  (4) /* pagecache is invalid */

#define CIFS_INO_LOCK			  (5) /* lock bit for synchronization */

#define CIFS_INO_MODIFIED_ATTR            (6) /* Indicate change in mtime/ctime */

#define CIFS_INO_CLOSE_ON_LOCK            (7) /* Not to defer the close when lock is set */

	unsigned long flags;

	spinlock_t writers_lock;

	unsigned int writers;		/* Number of writers on this inode */

fs/cifs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ int cifs_close(struct inode *inode, struct file *file) 
		dclose = kmalloc(sizeof(struct cifs_deferred_close), GFP_KERNEL);

		if ((cinode->oplock == CIFS_CACHE_RHW_FLG) &&

		    cinode->lease_granted &&

		    !test_bit(CIFS_INO_CLOSE_ON_LOCK, &cinode->flags) &&

		    dclose) {

			if (test_bit(CIFS_INO_MODIFIED_ATTR, &cinode->flags)) {

				inode->i_ctime = inode->i_mtime = current_time(inode);
@@ -1864,6 +1865,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock) 
	cifs_read_flock(flock, &type, &lock, &unlock, &wait_flag,

			tcon->ses->server);

	cifs_sb = CIFS_FILE_SB(file);

	set_bit(CIFS_INO_CLOSE_ON_LOCK, &CIFS_I(d_inode(cfile->dentry))->flags);



	if (cap_unix(tcon->ses) &&

	    (CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&