diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 10:33:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 10:33:39 -0800 |
| commit | 57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90 (patch) | |
| tree | e53318e43657531399a8d6c721760015b26aa152 /include | |
| parent | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 (diff) | |
| parent | GFS2: Fix nlink setting on inode creation (diff) | |
| download | linux-dev-57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90.tar.xz linux-dev-57e6a7dde8cfca9ac1d6702cf9104d22bc11ba90.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
GFS2: Fix nlink setting on inode creation
GFS2: fail mount if journal recovery fails
GFS2: let spectator mount do read only recovery
GFS2: Fix a use-after-free that coverity spotted
GFS2: dlm based recovery coordination
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gfs2_ondisk.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/gfs2_ondisk.h b/include/linux/gfs2_ondisk.h index 4f4462974c14..b148087f49a6 100644 --- a/include/linux/gfs2_ondisk.h +++ b/include/linux/gfs2_ondisk.h @@ -22,6 +22,8 @@ #define GFS2_LIVE_LOCK 1 #define GFS2_TRANS_LOCK 2 #define GFS2_RENAME_LOCK 3 +#define GFS2_CONTROL_LOCK 4 +#define GFS2_MOUNTED_LOCK 5 /* Format numbers for various metadata types */ |