xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'linus/master' into testing

Browse Source
This commit is contained in:
Sage Weil
2013-08-15 11:11:45 -07:00
parent fe2a801b50 f1d6e17f54
commit ee3e542fec
9493 changed files with 730791 additions and 284562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ceph/inode.c
View File

@@ -911,8 +911,8 @@ static struct dentry *splice_dentry(struct dentry *dn, struct inode *in,
} else if (realdn) {
dout("dn %p (%d) spliced with %p (%d) "
"inode %p ino %llx.%llx\n",
dn, dn->d_count,
realdn, realdn->d_count,
dn, d_count(dn),
realdn, d_count(realdn),
realdn->d_inode, ceph_vinop(realdn->d_inode));
dput(dn);
dn = realdn;