diff options
| author | Bob Peterson <rpeterso@redhat.com> | 2010-09-30 10:34:00 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2010-09-30 17:23:03 +0100 |
| commit | 46290341cd649c2bfb69e5067c1804c0395c83a1 (patch) | |
| tree | 1ef4a9c1d158ec182645d4be4cb3357a52a4404d /fs/gfs2/rgrp.h | |
| parent | feb47ca9314666d920855b8a235032dea2b2caa4 (diff) | |
| download | op-kernel-dev-46290341cd649c2bfb69e5067c1804c0395c83a1.zip op-kernel-dev-46290341cd649c2bfb69e5067c1804c0395c83a1.tar.gz | |
GFS2 fatal: filesystem consistency error on rename
This patch fixes a GFS2 problem whereby the first rename after a
mount can result in a file system consistency error being flagged
improperly and cause the file system to withdraw. The problem is
that the rename code tries to run the rgrp list with function
gfs2_blk2rgrpd before the rgrp list is guaranteed to be read in
from disk. The patch makes the rename function hold the rindex
glock (as the gfs2_unlink code does today) which reads in the rgrp
list if need be. There were a total of three places in the rename
code that improperly referenced the rgrp list without the rindex
glock and this patch fixes all three.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/rgrp.h')
| -rw-r--r-- | fs/gfs2/rgrp.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/gfs2/rgrp.h b/fs/gfs2/rgrp.h index f07119d..0e35c04 100644 --- a/fs/gfs2/rgrp.h +++ b/fs/gfs2/rgrp.h @@ -39,10 +39,12 @@ static inline void gfs2_alloc_put(struct gfs2_inode *ip) ip->i_alloc = NULL; } -extern int gfs2_inplace_reserve_i(struct gfs2_inode *ip, char *file, - unsigned int line); +extern int gfs2_inplace_reserve_i(struct gfs2_inode *ip, int hold_rindex, + char *file, unsigned int line); #define gfs2_inplace_reserve(ip) \ -gfs2_inplace_reserve_i((ip), __FILE__, __LINE__) + gfs2_inplace_reserve_i((ip), 1, __FILE__, __LINE__) +#define gfs2_inplace_reserve_ri(ip) \ + gfs2_inplace_reserve_i((ip), 0, __FILE__, __LINE__) extern void gfs2_inplace_release(struct gfs2_inode *ip); |
