UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ceph: ensure d_name/d_parent stability in ceph_mdsc_lease_send_msg() 

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 2019-05-23 10:45:24 +08:00 committed by Ilya Dryomov
parent 41883ba8ee
commit 8f2a98ef3c
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ceph/dir.c
View File

@ -1433,8 +1433,7 @@ static bool __dentry_lease_is_valid(struct ceph_dentry_info *di)
return false; return false;
} }
static int dentry_lease_is_valid(struct dentry *dentry, unsigned int flags, static int dentry_lease_is_valid(struct dentry *dentry, unsigned int flags)
struct inode *dir)
{ {
struct ceph_dentry_info *di; struct ceph_dentry_info *di;
struct ceph_mds_session *session = NULL; struct ceph_mds_session *session = NULL;
@ -1466,7 +1465,7 @@ static int dentry_lease_is_valid(struct dentry *dentry, unsigned int flags,
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
if (session) { if (session) {
ceph_mdsc_lease_send_msg(session, dir, dentry, ceph_mdsc_lease_send_msg(session, dentry,
CEPH_MDS_LEASE_RENEW, seq); CEPH_MDS_LEASE_RENEW, seq);
ceph_put_mds_session(session); ceph_put_mds_session(session);
} }
@ -1566,7 +1565,7 @@ static int ceph_d_revalidate(struct dentry *dentry, unsigned int flags)
ceph_snap(d_inode(dentry)) == CEPH_SNAPDIR) { ceph_snap(d_inode(dentry)) == CEPH_SNAPDIR) {
valid = 1; valid = 1;
} else { } else {
valid = dentry_lease_is_valid(dentry, flags, dir); valid = dentry_lease_is_valid(dentry, flags);
if (valid == -ECHILD) if (valid == -ECHILD)
return valid; return valid;
if (valid || dir_lease_is_valid(dir, dentry)) { if (valid || dir_lease_is_valid(dir, dentry)) {

24
fs/ceph/mds_client.c
View File

@ -3941,31 +3941,33 @@ bad:
} }
void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session, void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session,
struct inode *inode,
struct dentry *dentry, char action, struct dentry *dentry, char action,
u32 seq) u32 seq)
{ {
struct ceph_msg *msg; struct ceph_msg *msg;
struct ceph_mds_lease *lease; struct ceph_mds_lease *lease;
int len = sizeof(*lease) + sizeof(u32); struct inode *dir;
int dnamelen = 0; int len = sizeof(*lease) + sizeof(u32) + NAME_MAX;
dout("lease_send_msg inode %p dentry %p %s to mds%d\n", dout("lease_send_msg identry %p %s to mds%d\n",
inode, dentry, ceph_lease_op_name(action), session->s_mds); dentry, ceph_lease_op_name(action), session->s_mds);
dnamelen = dentry->d_name.len;
len += dnamelen;
msg = ceph_msg_new(CEPH_MSG_CLIENT_LEASE, len, GFP_NOFS, false); msg = ceph_msg_new(CEPH_MSG_CLIENT_LEASE, len, GFP_NOFS, false);
if (!msg) if (!msg)
return; return;
lease = msg->front.iov_base; lease = msg->front.iov_base;
lease->action = action; lease->action = action;
lease->ino = cpu_to_le64(ceph_vino(inode).ino);
lease->first = lease->last = cpu_to_le64(ceph_vino(inode).snap);
lease->seq = cpu_to_le32(seq); lease->seq = cpu_to_le32(seq);
put_unaligned_le32(dnamelen, lease + 1);
memcpy((void *)(lease + 1) + 4, dentry->d_name.name, dnamelen);
spin_lock(&dentry->d_lock);
dir = d_inode(dentry->d_parent);
lease->ino = cpu_to_le64(ceph_ino(dir));
lease->first = lease->last = cpu_to_le64(ceph_snap(dir));
put_unaligned_le32(dentry->d_name.len, lease + 1);
memcpy((void *)(lease + 1) + 4,
dentry->d_name.name, dentry->d_name.len);
spin_unlock(&dentry->d_lock);
/* /*
* if this is a preemptive lease RELEASE, no need to * if this is a preemptive lease RELEASE, no need to
* flush request stream, since the actual request will * flush request stream, since the actual request will

1
fs/ceph/mds_client.h
View File

@ -505,7 +505,6 @@ extern char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *base,
extern void __ceph_mdsc_drop_dentry_lease(struct dentry *dentry); extern void __ceph_mdsc_drop_dentry_lease(struct dentry *dentry);
extern void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session, extern void ceph_mdsc_lease_send_msg(struct ceph_mds_session *session,
struct inode *inode,
struct dentry *dentry, char action, struct dentry *dentry, char action,
u32 seq); u32 seq);