diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-14 10:20:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-14 10:20:42 -0700 |
| commit | 5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81 (patch) | |
| tree | 8cd651b2743b8af4805e0ae45b660ce8758960ae /fs/gfs2/incore.h | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d (diff) | |
| parent | 380f7c65a7eb3288e4b6812acf3474a1de230707 (diff) | |
| download | talos-obmc-linux-5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81.tar.gz talos-obmc-linux-5dcd07b9f39ca3e9be5bcc387d193fc0674e1c81.zip | |
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: Resolve inode eviction and ail list interaction bug
GFS2: Fix race during filesystem mount
GFS2: force a log flush when invalidating the rindex glock
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 0a064e91ac70..81206e70cbf6 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -17,6 +17,7 @@ #include <linux/buffer_head.h> #include <linux/rcupdate.h> #include <linux/rculist_bl.h> +#include <linux/completion.h> #define DIO_WAIT 0x00000010 #define DIO_METADATA 0x00000020 @@ -546,6 +547,7 @@ struct gfs2_sbd { struct gfs2_glock *sd_trans_gl; wait_queue_head_t sd_glock_wait; atomic_t sd_glock_disposal; + struct completion sd_locking_init; /* Inode Stuff */ |
