Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9670079f authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: move xattr initialzation before the encoding past the ceph_mds_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: default avatarJeff Layton <jlayton@redhat.com>
Reviewed-by: default avatarYan, Zheng <zyan@redhat.com>
parent 4945a084

fs/ceph/caps.c

+7 −7
Original line number Diff line number Diff line
@@ -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);
@@ -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;

}