From: Steven Whitehouse Date: Tue, 10 Oct 2006 17:45:15 +0000 (-0400) Subject: [GFS2] Fix uninitialised variable X-Git-Tag: v2.6.19-rc2~7^2~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f5c54804d9e3bb23d8924af09d9ca1c8de9560b6;p=linux-2.6-omap-h63xx.git [GFS2] Fix uninitialised variable This fixes a bug where, in certain cases an uninitialised variable could cause a dereference of a NULL pointer in gfs2_commit_write(). Also a typo in a comment is fixed at the same time. Signed-off-by: Steven Whitehouse --- diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index bdf56cf6622..99c933762eb 100644 --- a/fs/gfs2/ops_address.c +++ b/fs/gfs2/ops_address.c @@ -385,6 +385,7 @@ static int gfs2_prepare_write(struct file *file, struct page *page, goto out_unlock; + ip->i_alloc.al_requested = 0; if (alloc_required) { al = gfs2_alloc_get(ip); diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h index 9eedfd12bff..b01e0cfc99b 100644 --- a/fs/gfs2/rgrp.h +++ b/fs/gfs2/rgrp.h @@ -32,7 +32,7 @@ void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd); struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip); static inline void gfs2_alloc_put(struct gfs2_inode *ip) { - return; /* Se we can see where ip->i_alloc is used */ + return; /* So we can see where ip->i_alloc is used */ } int gfs2_inplace_reserve_i(struct gfs2_inode *ip,