diff options
author | Steve French <stfrench@microsoft.com> | 2018-08-02 21:28:18 -0400 |
---|---|---|
committer | Steve French <stfrench@microsoft.com> | 2018-08-07 15:30:59 -0400 |
commit | fd09b7d3b352105f08b8e02f7afecf7e816380ef (patch) | |
tree | ab7e3a43b2715df31acfb172fc2d2e608dc20fd5 /fs/cifs/inode.c | |
parent | d258650004617fbd5dfe97d77d26fb37187d06e9 (diff) |
smb3: Do not send SMB3 SET_INFO if nothing changed
An earlier commit had a typo which prevented the
optimization from working:
commit 18dd8e1a65dd ("Do not send SMB3 SET_INFO request if nothing is changing")
Thank you to Metze for noticing this. Also clear a
reserved field in the FILE_BASIC_INFO struct we send
that should be zero (all the other fields in that
struct were set or cleared explicitly already in
cifs_set_file_info).
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
CC: Stable <stable@vger.kernel.org> # 4.9.x+
Reported-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 054e880c1dac..d32eaa4b2437 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -1120,6 +1120,8 @@ cifs_set_file_info(struct inode *inode, struct iattr *attrs, unsigned int xid, | |||
1120 | if (!server->ops->set_file_info) | 1120 | if (!server->ops->set_file_info) |
1121 | return -ENOSYS; | 1121 | return -ENOSYS; |
1122 | 1122 | ||
1123 | info_buf.Pad = 0; | ||
1124 | |||
1123 | if (attrs->ia_valid & ATTR_ATIME) { | 1125 | if (attrs->ia_valid & ATTR_ATIME) { |
1124 | set_time = true; | 1126 | set_time = true; |
1125 | info_buf.LastAccessTime = | 1127 | info_buf.LastAccessTime = |