Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/freevxfs/vxfs_fshead.c b/fs/freevxfs/vxfs_fshead.c
index 05b19f70bf97..6dee109aeea4 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;
 }