diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-11 20:04:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-11 20:04:45 +0200 |
| commit | 1b6150fe82de8a555b0200d20bb5e3752fbe4160 (patch) | |
| tree | d03b71e1b87b60d1a9dfbade34156e930f1be1bd /fs/gfs2/bmap.c | |
| parent | x86: merge 32/64-bit versions of 'strncpy_from_user()' and speed it up (diff) | |
| parent | GFS2: Allow caching of rindex glock (diff) | |
| download | linux-1b6150fe82de8a555b0200d20bb5e3752fbe4160.tar.xz linux-1b6150fe82de8a555b0200d20bb5e3752fbe4160.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull GFS2 fixes from Steven Whitehouse
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes:
GFS2: Allow caching of rindex glock
GFS2: Make sure rindex is uptodate before starting transactions
GFS2: use depends instead of select in kconfig
GFS2: put glock reference in error patch of read_rindex_entry
Diffstat (limited to 'fs/gfs2/bmap.c')
| -rw-r--r-- | fs/gfs2/bmap.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 197c5c47e577..03c04febe26f 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -724,7 +724,11 @@ static int do_strip(struct gfs2_inode *ip, struct buffer_head *dibh, int metadata; unsigned int revokes = 0; int x; - int error = 0; + int error; + + error = gfs2_rindex_update(sdp); + if (error) + return error; if (!*top) sm->sm_first = 0; |