Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c54804 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[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: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 52ae7b79

fs/gfs2/ops_address.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

fs/gfs2/rgrp.h

+1 −1
Original line number Diff line number Diff line
@@ -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,