diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 09:31:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-27 09:31:09 -0700 |
| commit | e1f8826f5159d4aca5709c5d8d427319665fd5a1 (patch) | |
| tree | 2a42d2bffe5acb222d732d72b1bd4c002b683029 /fs/udf/udf_sb.h | |
| parent | sysfs: Allow mounting without CONFIG_NET (diff) | |
| parent | reiserfs: fix race with flush_used_journal_lists and flush_journal_list (diff) | |
| download | linux-dev-e1f8826f5159d4aca5709c5d8d427319665fd5a1.tar.xz linux-dev-e1f8826f5159d4aca5709c5d8d427319665fd5a1.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull reiserfs and UDF fixes from Jan Kara:
"The contains fix of an UDF oops when mounting corrupted media and a
fix of a race in reiserfs leading to oops"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
reiserfs: fix race with flush_used_journal_lists and flush_journal_list
reiserfs: remove useless flush_old_journal_lists
udf: Fortify LVID loading
Diffstat (limited to 'fs/udf/udf_sb.h')
| -rw-r--r-- | fs/udf/udf_sb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h index ed401e94aa8c..1f32c7bd9f57 100644 --- a/fs/udf/udf_sb.h +++ b/fs/udf/udf_sb.h @@ -162,7 +162,7 @@ static inline struct udf_sb_info *UDF_SB(struct super_block *sb) return sb->s_fs_info; } -struct logicalVolIntegrityDescImpUse *udf_sb_lvidiu(struct udf_sb_info *sbi); +struct logicalVolIntegrityDescImpUse *udf_sb_lvidiu(struct super_block *sb); int udf_compute_nr_groups(struct super_block *sb, u32 partition); |