static const struct nfsd4_callback_ops nfsd4_cb_recall_ops;
 static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops;
+static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops;
 
 static struct workqueue_struct *laundry_wq;
 
        dp->dl_recalled = false;
        nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client,
                      &nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL);
+       nfsd4_init_cb(&dp->dl_cb_fattr.ncf_getattr, dp->dl_stid.sc_client,
+                       &nfsd4_cb_getattr_ops, NFSPROC4_CLNT_CB_GETATTR);
+       dp->dl_cb_fattr.ncf_file_modified = false;
+       dp->dl_cb_fattr.ncf_cb_bmap[0] = FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE;
        get_nfs4_file(fp);
        dp->dl_stid.sc_file = fp;
        return dp;
        spin_unlock(&nn->client_lock);
 }
 
+static int
+nfsd4_cb_getattr_done(struct nfsd4_callback *cb, struct rpc_task *task)
+{
+       struct nfs4_cb_fattr *ncf =
+                       container_of(cb, struct nfs4_cb_fattr, ncf_getattr);
+
+       ncf->ncf_cb_status = task->tk_status;
+       switch (task->tk_status) {
+       case -NFS4ERR_DELAY:
+               rpc_delay(task, 2 * HZ);
+               return 0;
+       default:
+               return 1;
+       }
+}
+
+static void
+nfsd4_cb_getattr_release(struct nfsd4_callback *cb)
+{
+       struct nfs4_cb_fattr *ncf =
+                       container_of(cb, struct nfs4_cb_fattr, ncf_getattr);
+       struct nfs4_delegation *dp =
+                       container_of(ncf, struct nfs4_delegation, dl_cb_fattr);
+
+       nfs4_put_stid(&dp->dl_stid);
+       clear_bit(CB_GETATTR_BUSY, &ncf->ncf_cb_flags);
+       wake_up_bit(&ncf->ncf_cb_flags, CB_GETATTR_BUSY);
+}
+
 static const struct nfsd4_callback_ops nfsd4_cb_recall_any_ops = {
        .done           = nfsd4_cb_recall_any_done,
        .release        = nfsd4_cb_recall_any_release,
 };
 
+static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops = {
+       .done           = nfsd4_cb_getattr_done,
+       .release        = nfsd4_cb_getattr_release,
+};
+
+static void nfs4_cb_getattr(struct nfs4_cb_fattr *ncf)
+{
+       struct nfs4_delegation *dp =
+                       container_of(ncf, struct nfs4_delegation, dl_cb_fattr);
+
+       if (test_and_set_bit(CB_GETATTR_BUSY, &ncf->ncf_cb_flags))
+               return;
+       /* set to proper status when nfsd4_cb_getattr_done runs */
+       ncf->ncf_cb_status = NFS4ERR_IO;
+
+       refcount_inc(&dp->dl_stid.sc_count);
+       nfsd4_run_cb(&ncf->ncf_getattr);
+}
+
 static struct nfs4_client *create_client(struct xdr_netobj name,
                struct svc_rqst *rqstp, nfs4_verifier *verf)
 {
        struct svc_fh *parent = NULL;
        int cb_up;
        int status = 0;
+       struct kstat stat;
+       struct path path;
 
        cb_up = nfsd4_cb_channel_good(oo->oo_owner.so_client);
        open->op_recall = false;
        if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) {
                open->op_delegate_type = NFS4_OPEN_DELEGATE_WRITE;
                trace_nfsd_deleg_write(&dp->dl_stid.sc_stateid);
+               path.mnt = currentfh->fh_export->ex_path.mnt;
+               path.dentry = currentfh->fh_dentry;
+               if (vfs_getattr(&path, &stat,
+                               (STATX_SIZE | STATX_CTIME | STATX_CHANGE_COOKIE),
+                               AT_STATX_SYNC_AS_STAT)) {
+                       nfs4_put_stid(&dp->dl_stid);
+                       destroy_delegation(dp);
+                       goto out_no_deleg;
+               }
+               dp->dl_cb_fattr.ncf_cur_fsize = stat.size;
+               dp->dl_cb_fattr.ncf_initial_cinfo =
+                       nfsd4_change_attribute(&stat, d_inode(currentfh->fh_dentry));
        } else {
                open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
                trace_nfsd_deleg_read(&dp->dl_stid.sc_stateid);
  * nfsd4_deleg_getattr_conflict - Recall if GETATTR causes conflict
  * @rqstp: RPC transaction context
  * @inode: file to be checked for a conflict
+ * @modified: return true if file was modified
+ * @size: new size of file if modified is true
  *
  * This function is called when there is a conflict between a write
  * delegation and a change/size GETATTR from another client. The server
  * delegation before replying to the GETATTR. See RFC 8881 section
  * 18.7.4.
  *
- * The current implementation does not support CB_GETATTR yet. However
- * this can avoid recalling the delegation could be added in follow up
- * work.
- *
  * Returns 0 if there is no conflict; otherwise an nfs_stat
  * code is returned.
  */
 __be32
-nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode)
+nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
+                               bool *modified, u64 *size)
 {
        __be32 status;
        struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
        struct file_lock_context *ctx;
        struct file_lock *fl;
        struct nfs4_delegation *dp;
+       struct iattr attrs;
+       struct nfs4_cb_fattr *ncf;
 
+       *modified = false;
        ctx = locks_inode_context(inode);
        if (!ctx)
                return 0;
                                return 0;
                        }
 break_lease:
-                       spin_unlock(&ctx->flc_lock);
                        nfsd_stats_wdeleg_getattr_inc(nn);
-                       status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
-                       if (status != nfserr_jukebox ||
-                                       !nfsd_wait_for_delegreturn(rqstp, inode))
-                               return status;
+                       dp = fl->fl_owner;
+                       ncf = &dp->dl_cb_fattr;
+                       nfs4_cb_getattr(&dp->dl_cb_fattr);
+                       spin_unlock(&ctx->flc_lock);
+                       wait_on_bit_timeout(&ncf->ncf_cb_flags, CB_GETATTR_BUSY,
+                                       TASK_INTERRUPTIBLE, NFSD_CB_GETATTR_TIMEOUT);
+                       if (ncf->ncf_cb_status) {
+                               /* Recall delegation only if client didn't respond */
+                               status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
+                               if (status != nfserr_jukebox ||
+                                               !nfsd_wait_for_delegreturn(rqstp, inode))
+                                       return status;
+                       }
+                       if (!ncf->ncf_file_modified &&
+                                       (ncf->ncf_initial_cinfo != ncf->ncf_cb_change ||
+                                       ncf->ncf_cur_fsize != ncf->ncf_cb_fsize))
+                               ncf->ncf_file_modified = true;
+                       if (ncf->ncf_file_modified) {
+                               /*
+                                * Per section 10.4.3 of RFC 8881, the server would
+                                * not update the file's metadata with the client's
+                                * modified size
+                                */
+                               attrs.ia_mtime = attrs.ia_ctime = current_time(inode);
+                               attrs.ia_valid = ATTR_MTIME | ATTR_CTIME;
+                               setattr_copy(&nop_mnt_idmap, inode, &attrs);
+                               mark_inode_dirty(inode);
+                               ncf->ncf_cur_fsize = ncf->ncf_cb_fsize;
+                               *size = ncf->ncf_cur_fsize;
+                               *modified = true;
+                       }
                        return 0;
                }
                break;