Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[mv-sheeva.git] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 3f29bd224ba146c3ce3360f38d38b4aac16496f0..399d1b97804972b3b6f4f27c801f6f2b823dbd0b 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -203,6 +203,7 @@ struct gfs2_glock {
        unsigned int gl_target;
        unsigned int gl_reply;
        unsigned int gl_hash;
+       unsigned int gl_req;
        unsigned int gl_demote_state; /* state requested by remote node */
        unsigned long gl_demote_time; /* time of first demote request */
        struct list_head gl_holders;
@@ -470,6 +471,7 @@ struct gfs2_sb_host {
 
        char sb_lockproto[GFS2_LOCKNAME_LEN];
        char sb_locktable[GFS2_LOCKNAME_LEN];
+       u8 sb_uuid[16];
 };
 
 /*