From 51cc0e5a635fe2dacd3c53bb71494db1ba54e303 Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Tue, 10 Oct 2006 13:45:15 -0400 Subject: [PATCH] --- yaml --- r: 39546 b: refs/heads/master c: f5c54804d9e3bb23d8924af09d9ca1c8de9560b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/gfs2/ops_address.c | 1 + trunk/fs/gfs2/rgrp.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d2408db1c6a8..63a45322aed2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52ae7b7935a079aaba25da98fe90772d04109f26 +refs/heads/master: f5c54804d9e3bb23d8924af09d9ca1c8de9560b6 diff --git a/trunk/fs/gfs2/ops_address.c b/trunk/fs/gfs2/ops_address.c index bdf56cf66224..99c933762eb2 100644 --- a/trunk/fs/gfs2/ops_address.c +++ b/trunk/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/trunk/fs/gfs2/rgrp.h b/trunk/fs/gfs2/rgrp.h index 9eedfd12bfff..b01e0cfc99b5 100644 --- a/trunk/fs/gfs2/rgrp.h +++ b/trunk/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,