Skip to content

Commit

Permalink
ceph: move xattr initialzation before the encoding past the ceph_mds_…
Browse files Browse the repository at this point in the history
…caps

Just for clarity. This part is inside the header, so it makes sense to
group it with the rest of the stuff in the header.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
  • Loading branch information
Jeff Layton authored and Ilya Dryomov committed Dec 12, 2016
1 parent 4945a08 commit 9670079
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions fs/ceph/caps.c
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,13 @@ static int send_cap_msg(struct ceph_mds_session *session,
fc->gid = cpu_to_le32(from_kgid(&init_user_ns, gid));
fc->mode = cpu_to_le32(mode);

fc->xattr_version = cpu_to_le64(xattr_version);
if (xattrs_buf) {
msg->middle = ceph_buffer_get(xattrs_buf);
fc->xattr_len = cpu_to_le32(xattrs_buf->vec.iov_len);
msg->hdr.middle_len = cpu_to_le32(xattrs_buf->vec.iov_len);
}

p = fc + 1;
/* flock buffer size */
ceph_encode_32(&p, 0);
Expand All @@ -1069,13 +1076,6 @@ static int send_cap_msg(struct ceph_mds_session *session,
/* oldest_flush_tid */
ceph_encode_64(&p, oldest_flush_tid);

fc->xattr_version = cpu_to_le64(xattr_version);
if (xattrs_buf) {
msg->middle = ceph_buffer_get(xattrs_buf);
fc->xattr_len = cpu_to_le32(xattrs_buf->vec.iov_len);
msg->hdr.middle_len = cpu_to_le32(xattrs_buf->vec.iov_len);
}

ceph_con_send(&session->s_con, msg);
return 0;
}
Expand Down

0 comments on commit 9670079

Please sign in to comment.