projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
xfs
/
xfs_btree.c
diff --git
a/fs/xfs/xfs_btree.c
b/fs/xfs/xfs_btree.c
index 04f9cca8da7e6dd0f15e409aa86ac9ab1c6305ff..2f9e97c128a010aef87d96592dd7f4d6e741472c 100644
(file)
--- a/
fs/xfs/xfs_btree.c
+++ b/
fs/xfs/xfs_btree.c
@@
-634,9
+634,8
@@
xfs_btree_read_bufl(
return error;
}
ASSERT(!bp || !XFS_BUF_GETERROR(bp));
return error;
}
ASSERT(!bp || !XFS_BUF_GETERROR(bp));
- if (bp
!= NULL) {
+ if (bp
)
XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);
XFS_BUF_SET_VTYPE_REF(bp, B_FS_MAP, refval);
- }
*bpp = bp;
return 0;
}
*bpp = bp;
return 0;
}
@@
-944,13
+943,13
@@
xfs_btree_set_refs(
switch (cur->bc_btnum) {
case XFS_BTNUM_BNO:
case XFS_BTNUM_CNT:
switch (cur->bc_btnum) {
case XFS_BTNUM_BNO:
case XFS_BTNUM_CNT:
- XFS_BUF_SET_VTYPE_REF(
*bp
p, B_FS_MAP, XFS_ALLOC_BTREE_REF);
+ XFS_BUF_SET_VTYPE_REF(
b
p, B_FS_MAP, XFS_ALLOC_BTREE_REF);
break;
case XFS_BTNUM_INO:
break;
case XFS_BTNUM_INO:
- XFS_BUF_SET_VTYPE_REF(
*bp
p, B_FS_INOMAP, XFS_INO_BTREE_REF);
+ XFS_BUF_SET_VTYPE_REF(
b
p, B_FS_INOMAP, XFS_INO_BTREE_REF);
break;
case XFS_BTNUM_BMAP:
break;
case XFS_BTNUM_BMAP:
- XFS_BUF_SET_VTYPE_REF(
*bp
p, B_FS_MAP, XFS_BMAP_BTREE_REF);
+ XFS_BUF_SET_VTYPE_REF(
b
p, B_FS_MAP, XFS_BMAP_BTREE_REF);
break;
default:
ASSERT(0);
break;
default:
ASSERT(0);