diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 14:25:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-17 14:25:02 -0700 |
| commit | 820c687b70ae2c72972240b83c053cb7c85ddbc3 (patch) | |
| tree | 8a144e528f287c3e05ba97a60ade45be91f6255c /fs/udf/udf_sb.h | |
| parent | Merge tag 'jfs-4.7' of git://github.com/kleikamp/linux-shaggy (diff) | |
| parent | udf: Export superblock magic to userspace (diff) | |
| download | linux-dev-820c687b70ae2c72972240b83c053cb7c85ddbc3.tar.xz linux-dev-820c687b70ae2c72972240b83c053cb7c85ddbc3.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF fixes from Jan Kara:
"A fix for UDF crash on corrupted media and one UDF header fixup"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Export superblock magic to userspace
udf: Prevent stack overflow on corrupted filesystem mount
Diffstat (limited to 'fs/udf/udf_sb.h')
| -rw-r--r-- | fs/udf/udf_sb.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h index 1f32c7bd9f57..27b5335730c9 100644 --- a/fs/udf/udf_sb.h +++ b/fs/udf/udf_sb.h @@ -3,9 +3,7 @@ #include <linux/mutex.h> #include <linux/bitops.h> - -/* Since UDF 2.01 is ISO 13346 based... */ -#define UDF_SUPER_MAGIC 0x15013346 +#include <linux/magic.h> #define UDF_MAX_READ_VERSION 0x0250 #define UDF_MAX_WRITE_VERSION 0x0201 |