GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 22:58:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ceph: optimize flock encoding during reconnect

Browse source 
Don't malloc if there is no flock.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Yan, Zheng 2017-09-11 10:36:28 +08:00 • committed by Ilya Dryomov
parent c6db847233
commit 4deb14a259
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
fs/ceph/locks.c
View file

@ -431,19 +431,22 @@ int ceph_locks_to_pagelist(struct ceph_filelock *flocks,
if (err) if (err)
goto out_fail; goto out_fail;
err = ceph_pagelist_append(pagelist, flocks, if (num_fcntl_locks > 0) {
num_fcntl_locks * sizeof(*flocks)); err = ceph_pagelist_append(pagelist, flocks,
if (err) num_fcntl_locks * sizeof(*flocks));
goto out_fail; if (err)
goto out_fail;
}
nlocks = cpu_to_le32(num_flock_locks); nlocks = cpu_to_le32(num_flock_locks);
err = ceph_pagelist_append(pagelist, &nlocks, sizeof(nlocks)); err = ceph_pagelist_append(pagelist, &nlocks, sizeof(nlocks));
if (err) if (err)
goto out_fail; goto out_fail;
err = ceph_pagelist_append(pagelist, if (num_flock_locks > 0) {
&flocks[num_fcntl_locks], err = ceph_pagelist_append(pagelist, &flocks[num_fcntl_locks],
num_flock_locks * sizeof(*flocks)); num_flock_locks * sizeof(*flocks));
}
out_fail: out_fail:
return err; return err;
} }

34
fs/ceph/mds_client.c
View file

@ -2899,26 +2899,32 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap,
if (recon_state->msg_version >= 2) { if (recon_state->msg_version >= 2) {
int num_fcntl_locks, num_flock_locks; int num_fcntl_locks, num_flock_locks;
struct ceph_filelock *flocks; struct ceph_filelock *flocks = NULL;
size_t struct_len, total_len = 0; size_t struct_len, total_len = 0;
u8 struct_v = 0; u8 struct_v = 0;
encode_again: encode_again:
ceph_count_locks(inode, &num_fcntl_locks, &num_flock_locks); ceph_count_locks(inode, &num_fcntl_locks, &num_flock_locks);
flocks = kmalloc((num_fcntl_locks+num_flock_locks) * if (num_fcntl_locks + num_flock_locks > 0) {
sizeof(struct ceph_filelock), GFP_NOFS); flocks = kmalloc((num_fcntl_locks + num_flock_locks) *
if (!flocks) { sizeof(struct ceph_filelock), GFP_NOFS);
err = -ENOMEM; if (!flocks) {
goto out_free; err = -ENOMEM;
} goto out_free;
err = ceph_encode_locks_to_buffer(inode, flocks, }
num_fcntl_locks, err = ceph_encode_locks_to_buffer(inode, flocks,
num_flock_locks); num_fcntl_locks,
if (err) { num_flock_locks);
if (err) {
kfree(flocks);
flocks = NULL;
if (err == -ENOSPC)
goto encode_again;
goto out_free;
}
} else {
kfree(flocks); kfree(flocks);
if (err == -ENOSPC) flocks = NULL;
goto encode_again;
goto out_free;
} }
if (recon_state->msg_version >= 3) { if (recon_state->msg_version >= 3) {