cifs: if deferred close is disabled then close files immediately
Subsystems (2)
PATCH 1/1 cifs: if deferred close is disabled then close files immediately
If defer close timeout value is set to 0, then there is no need to include files in the deferred close list and utilize the delayed worker for closing. Instead, we can close them immediately.
Signed-off-by Bharath SM <[email protected]>
--- fs/smb/client/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/file.c +2 -2
@@ -1080,8 +1080,8 @@ int cifs_close(struct inode *inode, struct file *file) cfile = file->private_data; file->private_data =NULL ; dclose =kmalloc (sizeof (struct cifs_deferred_close ),GFP_KERNEL ); -if ((cinode->oplock ==CIFS_CACHE_RHW_FLG ) && - cinode->lease_granted && +if ((cifs_sb->ctx->closetimeo && cinode->oplock ==CIFS_CACHE_RHW_FLG ) + && cinode->lease_granted && !test_bit (CIFS_INO_CLOSE_ON_LOCK , &cinode->flags) && dclose) {if (test_and_clear_bit (CIFS_INO_MODIFIED_ATTR , &cinode->flags)) {
Signature · 1 line
2.34.1
Quoted 27 lines · Bharath SM
If defer close timeout value is set to 0, then there is no need to include files in the deferred close list and utilize the delayed worker for closing. Instead, we can close them immediately.
Signed-off-by Bharath SM <[email protected]>--- fs/smb/client/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/smb/client/file.c +2
-3@@ -1080,8 +1080,8 @@ int cifs_close(struct inode *inode, struct file *file) cfile = file->private_data; file->private_data =NULL ; dclose =kmalloc (sizeof (struct cifs_deferred_close ),GFP_KERNEL ); -if ((cinode->oplock ==CIFS_CACHE_RHW_FLG ) && - cinode->lease_granted && +if ((cifs_sb->ctx->closetimeo && cinode->oplock ==CIFS_CACHE_RHW_FLG ) + && cinode->lease_granted && !test_bit (CIFS_INO_CLOSE_ON_LOCK , &cinode->flags) && dclose) {if (test_and_clear_bit (CIFS_INO_MODIFIED_ATTR , &cinode->flags)) { --
Quoted 2 lines
2.34.1
Looks good to me. And should be CC stable.
Signature · 2 lines
Regards, Shyam