diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:38:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:38:53 -0500 |
| commit | 8cea4eb642890a1de58980e7e1617d1765ef8f7c (patch) | |
| tree | ea43bc34715d854c599743bf226437339bed1beb /fs/gfs2/Kconfig | |
| parent | 122ce878dc189860a380539bde19498bf93443a7 (diff) | |
| parent | 720e7749279bde0d08684b1bb4e7a2eedeec6394 (diff) | |
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: Skip check for mandatory locks when unlocking
GFS2: Allow the number of committed revokes to temporarily be negative
GFS2: do not select QUOTA
Diffstat (limited to 'fs/gfs2/Kconfig')
| -rw-r--r-- | fs/gfs2/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/gfs2/Kconfig b/fs/gfs2/Kconfig index 4dcddf83326f..a47b43107112 100644 --- a/fs/gfs2/Kconfig +++ b/fs/gfs2/Kconfig | |||
| @@ -8,7 +8,6 @@ config GFS2_FS | |||
| 8 | select FS_POSIX_ACL | 8 | select FS_POSIX_ACL |
| 9 | select CRC32 | 9 | select CRC32 |
| 10 | select SLOW_WORK | 10 | select SLOW_WORK |
| 11 | select QUOTA | ||
| 12 | select QUOTACTL | 11 | select QUOTACTL |
| 13 | help | 12 | help |
| 14 | A cluster filesystem. | 13 | A cluster filesystem. |