renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 09:43:59 +08:00
Code

ceph: use timespec64 for r_stamp

Browse Source 
The ceph_mds_request stamp still uses the deprecated timespec structure,
this converts it over as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Arnd Bergmann 2018-07-13 22:18:38 +02:00 committed by Ilya Dryomov
parent fac02ddf91
commit 0ed1e90a09
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ceph/inode.c
View File

@ -2136,7 +2136,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
req->r_inode_drop = release; req->r_inode_drop = release;
req->r_args.setattr.mask = cpu_to_le32(mask); req->r_args.setattr.mask = cpu_to_le32(mask);
req->r_num_caps = 1; req->r_num_caps = 1;
req->r_stamp = timespec64_to_timespec(attr->ia_ctime); req->r_stamp = attr->ia_ctime;
err = ceph_mdsc_do_request(mdsc, NULL, req); err = ceph_mdsc_do_request(mdsc, NULL, req);
} }
dout("setattr %p result=%d (%s locally, %d remote)\n", inode, err, dout("setattr %p result=%d (%s locally, %d remote)\n", inode, err,

7
fs/ceph/mds_client.c
View File

@ -1799,8 +1799,7 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode)
INIT_LIST_HEAD(&req->r_unsafe_item); INIT_LIST_HEAD(&req->r_unsafe_item);
ktime_get_coarse_real_ts64(&ts); ktime_get_coarse_real_ts64(&ts);
req->r_stamp = timespec64_to_timespec(timespec64_trunc(ts, req->r_stamp = timespec64_trunc(ts, mdsc->fsc->sb->s_time_gran);
mdsc->fsc->sb->s_time_gran));
req->r_op = op; req->r_op = op;
req->r_direct_mode = mode; req->r_direct_mode = mode;
@ -2097,7 +2096,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
/* time stamp */ /* time stamp */
{ {
struct ceph_timespec ts; struct ceph_timespec ts;
ceph_encode_timespec(&ts, &req->r_stamp); ceph_encode_timespec64(&ts, &req->r_stamp);
ceph_encode_copy(&p, &ts, sizeof(ts)); ceph_encode_copy(&p, &ts, sizeof(ts));
} }
@ -2190,7 +2189,7 @@ static int __prepare_send_request(struct ceph_mds_client *mdsc,
p = msg->front.iov_base + req->r_request_release_offset; p = msg->front.iov_base + req->r_request_release_offset;
{ {
struct ceph_timespec ts; struct ceph_timespec ts;
ceph_encode_timespec(&ts, &req->r_stamp); ceph_encode_timespec64(&ts, &req->r_stamp);
ceph_encode_copy(&p, &ts, sizeof(ts)); ceph_encode_copy(&p, &ts, sizeof(ts));
} }

2
fs/ceph/mds_client.h
View File

@ -229,7 +229,7 @@ struct ceph_mds_request {
int r_fmode; /* file mode, if expecting cap */ int r_fmode; /* file mode, if expecting cap */
kuid_t r_uid; kuid_t r_uid;
kgid_t r_gid; kgid_t r_gid;
struct timespec r_stamp; struct timespec64 r_stamp;
/* for choosing which mds to send this request to */ /* for choosing which mds to send this request to */
int r_direct_mode; int r_direct_mode;