diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-10 13:45:15 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-12 17:10:15 -0400 |
commit | f5c54804d9e3bb23d8924af09d9ca1c8de9560b6 (patch) | |
tree | 34b1b098b93d41a796e3e528445fa3d87030808e /fs | |
parent | 52ae7b7935a079aaba25da98fe90772d04109f26 (diff) |
[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 <swhiteho@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/gfs2/ops_address.c | 1 | ||||
-rw-r--r-- | fs/gfs2/rgrp.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c index bdf56cf66224..99c933762eb2 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, | |||
385 | goto out_unlock; | 385 | goto out_unlock; |
386 | 386 | ||
387 | 387 | ||
388 | ip->i_alloc.al_requested = 0; | ||
388 | if (alloc_required) { | 389 | if (alloc_required) { |
389 | al = gfs2_alloc_get(ip); | 390 | al = gfs2_alloc_get(ip); |
390 | 391 | ||
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h index 9eedfd12bfff..b01e0cfc99b5 100644 --- a/fs/gfs2/rgrp.h +++ b/fs/gfs2/rgrp.h | |||
@@ -32,7 +32,7 @@ void gfs2_rgrp_repolish_clones(struct gfs2_rgrpd *rgd); | |||
32 | struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip); | 32 | struct gfs2_alloc *gfs2_alloc_get(struct gfs2_inode *ip); |
33 | static inline void gfs2_alloc_put(struct gfs2_inode *ip) | 33 | static inline void gfs2_alloc_put(struct gfs2_inode *ip) |
34 | { | 34 | { |
35 | return; /* Se we can see where ip->i_alloc is used */ | 35 | return; /* So we can see where ip->i_alloc is used */ |
36 | } | 36 | } |
37 | 37 | ||
38 | int gfs2_inplace_reserve_i(struct gfs2_inode *ip, | 38 | int gfs2_inplace_reserve_i(struct gfs2_inode *ip, |