Skip to content

Commit

Permalink
cifs: do not ignore the SYNC flags in getattr
Browse files Browse the repository at this point in the history
Check the AT_STATX_FORCE_SYNC flag and force an attribute
revalidation if requested by the caller, and if the caller
specificies AT_STATX_DONT_SYNC only revalidate cached attributes
if required.  In addition do not flush writes in getattr (which
can be expensive) if size or timestamps not requested by the
caller.

Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
  • Loading branch information
Steve French committed Mar 23, 2020
1 parent 16fbf79 commit ffdec8d
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions fs/cifs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -2148,18 +2148,30 @@ int cifs_getattr(const struct path *path, struct kstat *stat,
* We need to be sure that all dirty pages are written and the server
* has actual ctime, mtime and file length.
*/
if (!CIFS_CACHE_READ(CIFS_I(inode)) && inode->i_mapping &&
inode->i_mapping->nrpages != 0) {
if ((request_mask & (STATX_CTIME | STATX_MTIME | STATX_SIZE)) &&
!CIFS_CACHE_READ(CIFS_I(inode)) &&
inode->i_mapping && inode->i_mapping->nrpages != 0) {
rc = filemap_fdatawait(inode->i_mapping);
if (rc) {
mapping_set_error(inode->i_mapping, rc);
return rc;
}
}

rc = cifs_revalidate_dentry_attr(dentry);
if (rc)
return rc;
if ((flags & AT_STATX_SYNC_TYPE) == AT_STATX_FORCE_SYNC)
CIFS_I(inode)->time = 0; /* force revalidate */

/*
* If the caller doesn't require syncing, only sync if
* necessary (e.g. due to earlier truncate or setattr
* invalidating the cached metadata)
*/
if (((flags & AT_STATX_SYNC_TYPE) != AT_STATX_DONT_SYNC) ||
(CIFS_I(inode)->time == 0)) {
rc = cifs_revalidate_dentry_attr(dentry);
if (rc)
return rc;
}

generic_fillattr(inode, stat);
stat->blksize = cifs_sb->bsize;
Expand Down

0 comments on commit ffdec8d

Please sign in to comment.