diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 00:06:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-05 00:06:48 (GMT) |
| commit | a3a71ca9a715776cf3eda605dafdb4a383782c4f (patch) | |
| tree | 5e5ae507d054106e87c2a26d81479955b2de1cfa /fs/gfs2/glock.h | |
| parent | 6f14a668f1a8b715a6e855f4e32705e54a6e86a1 (diff) | |
| parent | 8f05228ee7c8f409ae3c6f9c3e13d7ccb9c18360 (diff) | |
| download | linux-fsl-qoriq-a3a71ca9a715776cf3eda605dafdb4a383782c4f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
GFS2: Extend umount wait coverage to full glock lifetime
GFS2: Wait for unlock completion on umount
Diffstat (limited to 'fs/gfs2/glock.h')
| -rw-r--r-- | fs/gfs2/glock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h index 13f0bd2..c0262fa 100644 --- a/fs/gfs2/glock.h +++ b/fs/gfs2/glock.h @@ -123,7 +123,7 @@ struct lm_lockops { int (*lm_mount) (struct gfs2_sbd *sdp, const char *fsname); void (*lm_unmount) (struct gfs2_sbd *sdp); void (*lm_withdraw) (struct gfs2_sbd *sdp); - void (*lm_put_lock) (struct kmem_cache *cachep, void *gl); + void (*lm_put_lock) (struct kmem_cache *cachep, struct gfs2_glock *gl); unsigned int (*lm_lock) (struct gfs2_glock *gl, unsigned int req_state, unsigned int flags); void (*lm_cancel) (struct gfs2_glock *gl); |