git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
freevxfs
/
vxfs_fshead.c
diff --git
a/fs/freevxfs/vxfs_fshead.c
b/fs/freevxfs/vxfs_fshead.c
index
05b19f7
..
6dee109
100644
(file)
--- a/
fs/freevxfs/vxfs_fshead.c
+++ b/
fs/freevxfs/vxfs_fshead.c
@@
-78,17
+78,18
@@
vxfs_getfsh(struct inode *ip, int which)
struct buffer_head *bp;
bp = vxfs_bread(ip, which);
struct buffer_head *bp;
bp = vxfs_bread(ip, which);
- if (b
uffer_mapped(bp)
) {
+ if (b
p
) {
struct vxfs_fsh *fhp;
struct vxfs_fsh *fhp;
- if (!(fhp = kmalloc(sizeof(*fhp),
SLAB
_KERNEL)))
-
return NULL
;
+ if (!(fhp = kmalloc(sizeof(*fhp),
GFP
_KERNEL)))
+
goto out
;
memcpy(fhp, bp->b_data, sizeof(*fhp));
memcpy(fhp, bp->b_data, sizeof(*fhp));
-
brelse
(bp);
+
put_bh
(bp);
return (fhp);
}
return (fhp);
}
-
+out:
+ brelse(bp);
return NULL;
}
return NULL;
}