Merge tag 'ceph-for-6.7-rc1' of https://github.com/ceph/ceph-client

[linux-2.6-block.git] / fs / ceph / addr.c

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 63cb78fabebfd57db6ce0a6ff3eaeee7c0b80c4d..85be3bf18cdf38834de3141dfe0d6d75393c6d94 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -759,7 +759,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
              ceph_vinop(inode), page_off, len, wlen,
              IS_ENCRYPTED(inode) ? "" : "not ");
 
-       req->r_mtime = inode->i_mtime;
+       req->r_mtime = inode_get_mtime(inode);
        ceph_osdc_start_request(osdc, req);
        err = ceph_osdc_wait_request(osdc, req);
 
@@ -1345,7 +1345,7 @@ new_request:
                        pages = NULL;
                }
 
-               req->r_mtime = inode->i_mtime;
+               req->r_mtime = inode_get_mtime(inode);
                ceph_osdc_start_request(&fsc->client->osdc, req);
                req = NULL;
 
@@ -1902,7 +1902,7 @@ int ceph_uninline_data(struct file *file)
                goto out_unlock;
        }
 
-       req->r_mtime = inode->i_mtime;
+       req->r_mtime = inode_get_mtime(inode);
        ceph_osdc_start_request(&fsc->client->osdc, req);
        err = ceph_osdc_wait_request(&fsc->client->osdc, req);
        ceph_osdc_put_request(req);
@@ -1944,7 +1944,7 @@ int ceph_uninline_data(struct file *file)
                        goto out_put_req;
        }
 
-       req->r_mtime = inode->i_mtime;
+       req->r_mtime = inode_get_mtime(inode);
        ceph_osdc_start_request(&fsc->client->osdc, req);
        err = ceph_osdc_wait_request(&fsc->client->osdc, req);
 
@@ -2120,7 +2120,7 @@ static int __ceph_pool_perm_get(struct ceph_inode_info *ci,
                                     0, false, true);
        ceph_osdc_start_request(&fsc->client->osdc, rd_req);
 
-       wr_req->r_mtime = ci->netfs.inode.i_mtime;
+       wr_req->r_mtime = inode_get_mtime(&ci->netfs.inode);
        ceph_osdc_start_request(&fsc->client->osdc, wr_req);
 
        err = ceph_osdc_wait_request(&fsc->client->osdc, rd_req);