smb3: query attributes on file close

Since timestamps on files on most servers can be updated at
close, and since timestamps on our dentries default to one
second we can have stale timestamps in some common cases
(e.g. open, write, close, stat, wait one second, stat - will
show different mtime for the first and second stat).

The SMB2/SMB3 protocol allows querying timestamps at close
so add the code to request timestamp and attr information
(which is cheap for the server to provide) to be returned
when a file is closed (it is not needed for the many
paths that call SMB2_close that are from compounded
query infos and close nor is it needed for some of
the cases where a directory close immediately follows a
directory open.

Signed-off-by: Steve French <stfrench@microsoft.com>
Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index d34a4ed8c57d81c776234e51a6d99f5dcd9fb61c..5b976e01dd6be7970f70d0e886915e668432f376 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -368,6 +368,9 @@ struct smb_version_operations {
        /* close a file */
        void (*close)(const unsigned int, struct cifs_tcon *,
                      struct cifs_fid *);
+       /* close a file, returning file attributes and timestamps */
+       void (*close_getattr)(const unsigned int xid, struct cifs_tcon *tcon,
+                     struct cifsFileInfo *pfile_info);
        /* send a flush request to the server */
        int (*flush)(const unsigned int, struct cifs_tcon *, struct cifs_fid *);
        /* async read from the server */

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9ae41042fa3df2411781903e020a9e7042ee8e6c..043288b5c728a958dae722ace99a8bdd6a7cd52f 100644 (file)
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -496,7 +496,9 @@ void _cifsFileInfo_put(struct cifsFileInfo *cifs_file,
                unsigned int xid;
 
                xid = get_xid();
-               if (server->ops->close)
+               if (server->ops->close_getattr)
+                       server->ops->close_getattr(xid, tcon, cifs_file);
+               else if (server->ops->close)
                        server->ops->close(xid, tcon, &cifs_file->fid);
                _free_xid(xid);
        }

diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c
index 4121ac1163cabda6260adcf53f1814bc8112ba67..18c7a33adcebf36b7908566897de44a1de683c46 100644 (file)
--- a/fs/cifs/smb2inode.c
+++ b/fs/cifs/smb2inode.c
@@ -313,7 +313,7 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon,
        rqst[num_rqst].rq_iov = close_iov;
        rqst[num_rqst].rq_nvec = 1;
        rc = SMB2_close_init(tcon, &rqst[num_rqst], COMPOUND_FID,
-                            COMPOUND_FID);
+                            COMPOUND_FID, false);
        smb2_set_related(&rqst[num_rqst]);
        if (rc)
                goto finished;

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index a7f328f79c6f0d11654bfe76cbec595618bd9d2f..a5c96bc522cb3e3afaf2f8e582aa586f5325cfc0 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -1178,7 +1178,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon,
        memset(&close_iov, 0, sizeof(close_iov));
        rqst[2].rq_iov = close_iov;
        rqst[2].rq_nvec = 1;
-       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID);
+       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
        smb2_set_related(&rqst[2]);
 
        rc = compound_send_recv(xid, ses, flags, 3, rqst,
@@ -1332,6 +1332,45 @@ smb2_close_file(const unsigned int xid, struct cifs_tcon *tcon,
        SMB2_close(xid, tcon, fid->persistent_fid, fid->volatile_fid);
 }
 
+static void
+smb2_close_getattr(const unsigned int xid, struct cifs_tcon *tcon,
+                  struct cifsFileInfo *cfile)
+{
+       struct smb2_file_network_open_info file_inf;
+       struct inode *inode;
+       int rc;
+
+       rc = __SMB2_close(xid, tcon, cfile->fid.persistent_fid,
+                  cfile->fid.volatile_fid, &file_inf);
+       if (rc)
+               return;
+
+       inode = d_inode(cfile->dentry);
+
+       spin_lock(&inode->i_lock);
+       CIFS_I(inode)->time = jiffies;
+
+       /* Creation time should not need to be updated on close */
+       if (file_inf.LastWriteTime)
+               inode->i_mtime = cifs_NTtimeToUnix(file_inf.LastWriteTime);
+       if (file_inf.ChangeTime)
+               inode->i_ctime = cifs_NTtimeToUnix(file_inf.ChangeTime);
+       if (file_inf.LastAccessTime)
+               inode->i_atime = cifs_NTtimeToUnix(file_inf.LastAccessTime);
+
+       /*
+        * i_blocks is not related to (i_size / i_blksize),
+        * but instead 512 byte (2**9) size is required for
+        * calculating num blocks.
+        */
+       if (le64_to_cpu(file_inf.AllocationSize) > 4096)
+               inode->i_blocks =
+                       (512 - 1 + le64_to_cpu(file_inf.AllocationSize)) >> 9;
+
+       /* End of file and Attributes should not have to be updated on close */
+       spin_unlock(&inode->i_lock);
+}
+
 static int
 SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon,
                     u64 persistent_fid, u64 volatile_fid,
@@ -1512,7 +1551,7 @@ smb2_ioctl_query_info(const unsigned int xid,
        rqst[2].rq_iov = close_iov;
        rqst[2].rq_nvec = 1;
 
-       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID);
+       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
        if (rc)
                goto iqinf_exit;
        smb2_set_related(&rqst[2]);
@@ -2241,7 +2280,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon,
        rqst[2].rq_iov = close_iov;
        rqst[2].rq_nvec = 1;
 
-       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID);
+       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
        if (rc)
                goto qic_exit;
        smb2_set_related(&rqst[2]);
@@ -2654,7 +2693,7 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
        rqst[2].rq_iov = close_iov;
        rqst[2].rq_nvec = 1;
 
-       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID);
+       rc = SMB2_close_init(tcon, &rqst[2], COMPOUND_FID, COMPOUND_FID, false);
        if (rc)
                goto querty_exit;
 
@@ -4707,6 +4746,7 @@ struct smb_version_operations smb30_operations = {
        .open = smb2_open_file,
        .set_fid = smb2_set_fid,
        .close = smb2_close_file,
+       .close_getattr = smb2_close_getattr,
        .flush = smb2_flush_file,
        .async_readv = smb2_async_readv,
        .async_writev = smb2_async_writev,
@@ -4816,6 +4856,7 @@ struct smb_version_operations smb311_operations = {
        .open = smb2_open_file,
        .set_fid = smb2_set_fid,
        .close = smb2_close_file,
+       .close_getattr = smb2_close_getattr,
        .flush = smb2_flush_file,
        .async_readv = smb2_async_readv,
        .async_writev = smb2_async_writev,

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index cec53eb8a6daf1bd71eb7010a37640b16201514e..187a5ce68806fe050ed8bb5eda2848bfa7797b67 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -2932,7 +2932,7 @@ SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon,
 
 int
 SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
-               u64 persistent_fid, u64 volatile_fid)
+               u64 persistent_fid, u64 volatile_fid, bool query_attrs)
 {
        struct smb2_close_req *req;
        struct kvec *iov = rqst->rq_iov;
@@ -2945,6 +2945,10 @@ SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
 
        req->PersistentFileId = persistent_fid;
        req->VolatileFileId = volatile_fid;
+       if (query_attrs)
+               req->Flags = SMB2_CLOSE_FLAG_POSTQUERY_ATTRIB;
+       else
+               req->Flags = 0;
        iov[0].iov_base = (char *)req;
        iov[0].iov_len = total_len;
 
@@ -2959,8 +2963,9 @@ SMB2_close_free(struct smb_rqst *rqst)
 }
 
 int
-SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
-                u64 persistent_fid, u64 volatile_fid)
+__SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
+            u64 persistent_fid, u64 volatile_fid,
+            struct smb2_file_network_open_info *pbuf)
 {
        struct smb_rqst rqst;
        struct smb2_close_rsp *rsp = NULL;
@@ -2970,6 +2975,7 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
        int resp_buftype = CIFS_NO_BUFFER;
        int rc = 0;
        int flags = 0;
+       bool query_attrs = false;
 
        cifs_dbg(FYI, "Close\n");
 
@@ -2984,8 +2990,13 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
        rqst.rq_iov = iov;
        rqst.rq_nvec = 1;
 
+       /* check if need to ask server to return timestamps in close response */
+       if (pbuf)
+               query_attrs = true;
+
        trace_smb3_close_enter(xid, persistent_fid, tcon->tid, ses->Suid);
-       rc = SMB2_close_init(tcon, &rqst, persistent_fid, volatile_fid);
+       rc = SMB2_close_init(tcon, &rqst, persistent_fid, volatile_fid,
+                            query_attrs);
        if (rc)
                goto close_exit;
 
@@ -2997,14 +3008,18 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
                trace_smb3_close_err(xid, persistent_fid, tcon->tid, ses->Suid,
                                     rc);
                goto close_exit;
-       } else
+       } else {
                trace_smb3_close_done(xid, persistent_fid, tcon->tid,
                                      ses->Suid);
+               /*
+                * Note that have to subtract 4 since struct network_open_info
+                * has a final 4 byte pad that close response does not have
+                */
+               if (pbuf)
+                       memcpy(pbuf, (char *)&rsp->CreationTime, sizeof(*pbuf) - 4);
+       }
 
        atomic_dec(&tcon->num_remote_opens);
-
-       /* BB FIXME - decode close response, update inode for caching */
-
 close_exit:
        SMB2_close_free(&rqst);
        free_rsp_buf(resp_buftype, rsp);
@@ -3022,6 +3037,13 @@ close_exit:
        return rc;
 }
 
+int
+SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
+               u64 persistent_fid, u64 volatile_fid)
+{
+       return __SMB2_close(xid, tcon, persistent_fid, volatile_fid, NULL);
+}
+
 int
 smb2_validate_iov(unsigned int offset, unsigned int buffer_length,
                  struct kvec *iov, unsigned int min_buf_size)

diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index f264e1d36fe16452b2cdc811dacd10cf09b74698..fa2533da316d2df6714eb0c99cdecf75293eed23 100644 (file)
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -1570,6 +1570,17 @@ struct smb2_file_eof_info { /* encoding of request for level 10 */
        __le64 EndOfFile; /* new end of file value */
 } __packed; /* level 20 Set */
 
+struct smb2_file_network_open_info {
+       __le64 CreationTime;
+       __le64 LastAccessTime;
+       __le64 LastWriteTime;
+       __le64 ChangeTime;
+       __le64 AllocationSize;
+       __le64 EndOfFile;
+       __le32 Attributes;
+       __le32 Reserved;
+} __packed; /* level 34 Query also similar returned in close rsp and open rsp */
+
 extern char smb2_padding[7];
 
 #endif                         /* _SMB2PDU_H */

diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h
index 5caeaa99cb7c4d5f1b1116351853738eea26a9a1..a18272c987fed92ebbc0347c3e68a5565499ff23 100644 (file)
--- a/fs/cifs/smb2proto.h
+++ b/fs/cifs/smb2proto.h
@@ -155,10 +155,13 @@ extern int SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
                        u64 persistent_fid, u64 volatile_fid, bool watch_tree,
                        u32 completion_filter);
 
+extern int __SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
+                       u64 persistent_fid, u64 volatile_fid,
+                       struct smb2_file_network_open_info *pbuf);
 extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
                      u64 persistent_file_id, u64 volatile_file_id);
 extern int SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
-                     u64 persistent_file_id, u64 volatile_file_id);
+                     u64 persistent_fid, u64 volatile_fid, bool query_attrs);
 extern void SMB2_close_free(struct smb_rqst *rqst);
 extern int SMB2_flush(const unsigned int xid, struct cifs_tcon *tcon,
                      u64 persistent_file_id, u64 volatile_file_id);