cifs: remove superfluous inode_lock in cifs_{strict_}fsync
Subsystems (2)
RFC PATCH 1/1 cifs: remove superfluous inode_lock in cifs_{strict_}fsync
Originally, filemap_write_and_wait took the i_mutex internally, but commit 02c24a82187d pushed the mutex acquisition into the individual fsync routines, leaving it up to the subsystem maintainers to remove it if it wasn't needed.
For cifs, I see no reason to take the inode_lock here. All of the operations inside that lock are protected in other ways.
--- fs/cifs/file.c | 5 ----- 1 file changed, 5 deletions(-)
Steve, would you or someone else be able to test this?
I'm proposing a similar patch for kcephfs. I don't have an appropriate test rig at the moment, and I was hoping someone more involved with cifs.ko development these days may be able to do so.
Thanks,
Jeff
fs/cifs/file.c +0 -5
@@ -2424,7 +2424,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();
@@ -2449,7 +2448,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, }free_xid (xid); -inode_unlock (inode);return rc; }
@@ -2461,12 +2459,10 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct TCP_Server_Info *server;struct cifsFileInfo *smbfile = file->private_data;struct cifs_sb_info *cifs_sb =CIFS_FILE_SB (file); -struct inode *inode = file->f_mapping->host; rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();
@@ -2483,7 +2479,6 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) }free_xid (xid); -inode_unlock (inode);return rc; }
Signature · 1 line
2.20.1
Kicked off automated tests with this patch included - see
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/184
(I will kick off other test buckets later)
Quoted 67 lines · Jeff Layton
Originally,
filemap_write_and_waittook thei_mutexinternally, but commit02c24a82187dpushed the mutex acquisition into the individual fsync routines, leaving it up to the subsystem maintainers to remove it if it wasn't needed.For cifs, I see no reason to take the
inode_lockhere. All of the operations inside that lock are protected in other ways.Signed-off-by Jeff Layton <[email protected]>--- fs/cifs/file.c | 5 ----- 1 file changed, 5 deletions(-)Steve, would you or someone else be able to test this?
I'm proposing a similar patch for kcephfs. I don't have an appropriate test rig at the moment, and I was hoping someone more involved with cifs.ko development these days may be able to do so.
Thanks,
Jefffs/cifs/file.c +0
-6@@ -2424,7 +2424,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2449,7 +2448,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, }free_xid (xid); -inode_unlock (inode);return rc; }@@ -2461,12 +2459,10 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct TCP_Server_Info *server;struct cifsFileInfo *smbfile = file->private_data;struct cifs_sb_info *cifs_sb =CIFS_FILE_SB (file); -struct inode *inode = file->f_mapping->host; rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2483,7 +2479,6 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) }free_xid (xid); -inode_unlock (inode);return rc; } --2.20.1
Signature · 3 lines
Thanks, Steve
Restarted the automated tests after updating for-next and added this patch ontop
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/185
Quoted 79 lines · Steve French
Kicked off automated tests with this patch included - see
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/184
(I will kick off other test buckets later)Quoted 65 lines · Jeff Layton
Originally,
filemap_write_and_waittook thei_mutexinternally, but commit02c24a82187dpushed the mutex acquisition into the individual fsync routines, leaving it up to the subsystem maintainers to remove it if it wasn't needed.For cifs, I see no reason to take the
inode_lockhere. All of the operations inside that lock are protected in other ways.Signed-off-by Jeff Layton <[email protected]>--- fs/cifs/file.c | 5 ----- 1 file changed, 5 deletions(-)Steve, would you or someone else be able to test this?
I'm proposing a similar patch for kcephfs. I don't have an appropriate test rig at the moment, and I was hoping someone more involved with cifs.ko development these days may be able to do so.
Thanks,
Jefffs/cifs/file.c +0
-6@@ -2424,7 +2424,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2449,7 +2448,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, }free_xid (xid); -inode_unlock (inode);return rc; }@@ -2461,12 +2459,10 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct TCP_Server_Info *server;struct cifsFileInfo *smbfile = file->private_data;struct cifs_sb_info *cifs_sb =CIFS_FILE_SB (file); -struct inode *inode = file->f_mapping->host; rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2483,7 +2479,6 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) }free_xid (xid); -inode_unlock (inode);return rc; } --Quoted 2 lines
2.20.1
--
Thanks,Steve
Signature · 3 lines
Thanks, Steve
Pavel Shilovsky
Acked-by--
Best regards,
Pavel Shilovsky
пн, 8 апр. 2019 г. в 09:06, Steve French <[email protected]>:
Quoted 92 lines
Restarted the automated tests after updating for-next and added this patch ontop
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/185
Quoted 78 lines · Steve French
Kicked off automated tests with this patch included - see
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/184
(I will kick off other test buckets later)Quoted 65 lines · Jeff Layton
Originally,
filemap_write_and_waittook thei_mutexinternally, but commit02c24a82187dpushed the mutex acquisition into the individual fsync routines, leaving it up to the subsystem maintainers to remove it if it wasn't needed.For cifs, I see no reason to take the
inode_lockhere. All of the operations inside that lock are protected in other ways.Signed-off-by Jeff Layton <[email protected]>--- fs/cifs/file.c | 5 ----- 1 file changed, 5 deletions(-)Steve, would you or someone else be able to test this?
I'm proposing a similar patch for kcephfs. I don't have an appropriate test rig at the moment, and I was hoping someone more involved with cifs.ko development these days may be able to do so.
Thanks,
Jefffs/cifs/file.c +0
-6@@ -2424,7 +2424,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2449,7 +2448,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, }free_xid (xid); -inode_unlock (inode);return rc; }@@ -2461,12 +2459,10 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct TCP_Server_Info *server;struct cifsFileInfo *smbfile = file->private_data;struct cifs_sb_info *cifs_sb =CIFS_FILE_SB (file); -struct inode *inode = file->f_mapping->host; rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2483,7 +2479,6 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) }free_xid (xid); -inode_unlock (inode);return rc; } --Quoted 2 lines
2.20.1
--
Thanks,Quoted 1 line
Steve
--
Thanks,Steve
It passed automated testing (the most recent test bucket run was
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/4/builds/141
but it also passed the other test group
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/185)
Quoted 100 lines · Pavel Shilovsky
Acked-by Pavel Shilovsky <[email protected]>--
Best regards,
Pavel Shilovskyпн, 8 апр. 2019 г. в 09:06, Steve French <[email protected]>:
Quoted 92 lines
Restarted the automated tests after updating for-next and added this patch ontop
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/185
Quoted 78 lines · Steve French
Kicked off automated tests with this patch included - see
http://smb3-test-rhel-75.southcentralus.cloudapp.azure.com/#/builders/2/builds/184
(I will kick off other test buckets later)Quoted 65 lines · Jeff Layton
Originally,
filemap_write_and_waittook thei_mutexinternally, but commit02c24a82187dpushed the mutex acquisition into the individual fsync routines, leaving it up to the subsystem maintainers to remove it if it wasn't needed.For cifs, I see no reason to take the
inode_lockhere. All of the operations inside that lock are protected in other ways.Signed-off-by Jeff Layton <[email protected]>--- fs/cifs/file.c | 5 ----- 1 file changed, 5 deletions(-)Steve, would you or someone else be able to test this?
I'm proposing a similar patch for kcephfs. I don't have an appropriate test rig at the moment, and I was hoping someone more involved with cifs.ko development these days may be able to do so.
Thanks,
Jefffs/cifs/file.c +0
-6@@ -2424,7 +2424,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2449,7 +2448,6 @@ int cifs_strict_fsync(struct file *file, loff_t start, loff_t end, }free_xid (xid); -inode_unlock (inode);return rc; }@@ -2461,12 +2459,10 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)struct TCP_Server_Info *server;struct cifsFileInfo *smbfile = file->private_data;struct cifs_sb_info *cifs_sb =CIFS_FILE_SB (file); -struct inode *inode = file->f_mapping->host; rc =file_write_and_wait_range (file, start, end);if (rc)return rc; -inode_lock (inode); xid =get_xid ();@@ -2483,7 +2479,6 @@ int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync) }free_xid (xid); -inode_unlock (inode);return rc; } --Quoted 2 lines
2.20.1
--
Thanks,Quoted 1 line
Steve
--
Thanks,Steve
Signature · 3 lines
Thanks, Steve