diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 12:33:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 12:33:52 -0700 |
| commit | dc8ca9cc6e23054eb85599c9417ef2416848e7e8 (patch) | |
| tree | ea31d2b14bb256043db8186525f0eb07776ecd65 /fs/gfs2/incore.h | |
| parent | 5d6b501fe5421c5df662e2935f55f5e3d2b5e012 (diff) | |
| parent | 638803d4568121d73a266e440530f880ffa2dacc (diff) | |
Merge tag 'gfs2-v5.2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fix from Andreas Gruenbacher:
"A revert for a patch that turned out to be broken"
* tag 'gfs2-v5.2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
Revert "gfs2: Replace gl_revokes with a GLF flag"
Diffstat (limited to 'fs/gfs2/incore.h')
| -rw-r--r-- | fs/gfs2/incore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index b15755068593..1d35e0da0ef8 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -345,7 +345,6 @@ enum { GLF_OBJECT = 14, /* Used only for tracing */ GLF_BLOCKING = 15, GLF_INODE_CREATING = 16, /* Inode creation occurring */ - GLF_REVOKES = 17, /* Glock has revokes in queue */ }; struct gfs2_glock { @@ -375,6 +374,7 @@ struct gfs2_glock { struct list_head gl_lru; struct list_head gl_ail_list; atomic_t gl_ail_count; + atomic_t gl_revokes; struct delayed_work gl_work; union { /* For inode and iopen glocks only */ |