diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-23 19:52:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-23 19:52:00 -0700 |
| commit | 95f714727436836bb46236ce2bcd8ee8f9274aed (patch) | |
| tree | 200ea790bf3299c9120b65b890ac85f56337d848 /fs/ext4 | |
| parent | ce1ee9f5b99fa4ba332692194aa57b604112762f (diff) | |
| parent | db7e5c668e1b16061fe2d94d3cba022dd360c5d4 (diff) | |
| download | linux-3.10-95f714727436836bb46236ce2bcd8ee8f9274aed.tar.gz linux-3.10-95f714727436836bb46236ce2bcd8ee8f9274aed.tar.bz2 linux-3.10-95f714727436836bb46236ce2bcd8ee8f9274aed.zip | |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Ted Ts'o:
"These are two low-risk bug fixes for ext4, fixing a compile warning
and a potential deadlock."
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
super.c: unused variable warning without CONFIG_QUOTA
jbd2: use GFP_NOFS for blkdev_issue_flush
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 6da193564e4..e1fb1d5de58 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1597,7 +1597,9 @@ static int parse_options(char *options, struct super_block *sb, unsigned int *journal_ioprio, int is_remount) { +#ifdef CONFIG_QUOTA struct ext4_sb_info *sbi = EXT4_SB(sb); +#endif char *p; substring_t args[MAX_OPT_ARGS]; int token; |