summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2005-06-30 02:59:04 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 08:45:12 -0700
commitba03bda81e160b2724451074cdcb597d14f7d7e0 (patch)
tree5a4b9a7a39a08f01656d4eda549ecc6fee80f822 /fs
parentf220ab2a5162c35cca6993ea473937cfc962fce4 (diff)
downloadop-kernel-dev-ba03bda81e160b2724451074cdcb597d14f7d7e0.zip
op-kernel-dev-ba03bda81e160b2724451074cdcb597d14f7d7e0.tar.gz
[PATCH] freevxfs: fix buffer_head leak
- fix a buffer_head leak in vxfs_getfsh() - s/SLAB_KERNEL/GFP_KERNEL/ - check sb_bread() return value - drop pointless buffer-mapped() test. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/freevxfs/vxfs_fshead.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c
index 05b19f7..6dee109 100644
--- 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);
- if (buffer_mapped(bp)) {
+ if (bp) {
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));
- brelse(bp);
+ put_bh(bp);
return (fhp);
}
-
+out:
+ brelse(bp);
return NULL;
}
OpenPOWER on IntegriCloud