hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph: always initialize the dentry in open_root_dentry() 

When open_root_dentry() gets a dentry via d_obtain_alias() it does
not get initialized.  If the dentry obtained came from the cache,
this is OK.  But if not, the result is an improperly initialized
dentry.

To fix this, call ceph_init_dentry() regardless of which path
produced the dentry.  That function returns immediately for a dentry
that is already initialized, it is safe to use either way.

(Credit to Sage, who suggested this fix.)

Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Alex Elder 2012-01-04 16:30:15 -06:00 committed by Sage Weil
parent 56e925b677
commit d46cfba536
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ceph/super.c
View File

@ -638,12 +638,11 @@ static struct dentry *open_root_dentry(struct ceph_fs_client *fsc,
if (err == 0) { if (err == 0) {
dout("open_root_inode success\n"); dout("open_root_inode success\n");
if (ceph_ino(req->r_target_inode) == CEPH_INO_ROOT && if (ceph_ino(req->r_target_inode) == CEPH_INO_ROOT &&
fsc->sb->s_root == NULL) { fsc->sb->s_root == NULL)
root = d_alloc_root(req->r_target_inode); root = d_alloc_root(req->r_target_inode);
ceph_init_dentry(root); else
} else {
root = d_obtain_alias(req->r_target_inode); root = d_obtain_alias(req->r_target_inode);
} ceph_init_dentry(root);
req->r_target_inode = NULL; req->r_target_inode = NULL;
dout("open_root_inode success, root dentry is %p\n", root); dout("open_root_inode success, root dentry is %p\n", root);
} else { } else {