diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 16:06:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 16:06:48 -0800 |
| commit | a3a71ca9a715776cf3eda605dafdb4a383782c4f (patch) | |
| tree | 5e5ae507d054106e87c2a26d81479955b2de1cfa /fs/gfs2/incore.h | |
| parent | 6f14a668f1a8b715a6e855f4e32705e54a6e86a1 (diff) | |
| parent | 8f05228ee7c8f409ae3c6f9c3e13d7ccb9c18360 (diff) | |
| download | op-kernel-dev-a3a71ca9a715776cf3eda605dafdb4a383782c4f.zip op-kernel-dev-a3a71ca9a715776cf3eda605dafdb4a383782c4f.tar.gz | |
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/incore.h')
| -rw-r--r-- | fs/gfs2/incore.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index 4792200..bc0ad15 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -544,6 +544,8 @@ struct gfs2_sbd { struct gfs2_holder sd_live_gh; struct gfs2_glock *sd_rename_gl; struct gfs2_glock *sd_trans_gl; + wait_queue_head_t sd_glock_wait; + atomic_t sd_glock_disposal; /* Inode Stuff */ |
