mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
ANDROID: Revert: Merge 5.4.60 into android11-5.4
Something is going flaky with the ABI checker, so back this merge out at the moment so that we can fix things up first before merging this back in. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman <[email protected]> Change-Id: I41ada004b1596b4961f95d9de48ca7b677d05226
This commit is contained in:
parent
98f3e290c5
commit
f553ed04bc
151 changed files with 626 additions and 1084 deletions
|
|
@ -920,10 +920,6 @@ static int ceph_symlink(struct inode *dir, struct dentry *dentry,
|
|||
req->r_num_caps = 2;
|
||||
req->r_dentry_drop = CEPH_CAP_FILE_SHARED | CEPH_CAP_AUTH_EXCL;
|
||||
req->r_dentry_unless = CEPH_CAP_FILE_EXCL;
|
||||
if (as_ctx.pagelist) {
|
||||
req->r_pagelist = as_ctx.pagelist;
|
||||
as_ctx.pagelist = NULL;
|
||||
}
|
||||
err = ceph_mdsc_do_request(mdsc, dir, req);
|
||||
if (!err && !req->r_reply_info.head->is_dentry)
|
||||
err = ceph_handle_notrace_create(dir, dentry);
|
||||
|
|
|
|||
|
|
@ -3091,10 +3091,8 @@ static void handle_session(struct ceph_mds_session *session,
|
|||
goto bad;
|
||||
/* version >= 3, feature bits */
|
||||
ceph_decode_32_safe(&p, end, len, bad);
|
||||
if (len) {
|
||||
ceph_decode_64_safe(&p, end, features, bad);
|
||||
p += len - sizeof(features);
|
||||
}
|
||||
ceph_decode_64_safe(&p, end, features, bad);
|
||||
p += len - sizeof(features);
|
||||
}
|
||||
|
||||
mutex_lock(&mdsc->mutex);
|
||||
|
|
|
|||
Loading…
Reference in a new issue