On Tue 04-03-14 12:11:17, Jan Kara wrote: > On Tue 04-03-14 11:00:57, Karel Zak wrote: > > Move the magic number to proper place. > > > > CC: Jan Kara <jack@xxxxxxx> > > Signed-off-by: Karel Zak <kzak@xxxxxxxxxx> > > --- > > fs/udf/udf_sb.h | 2 +- > > include/uapi/linux/magic.h | 1 + > > 2 files changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h > > index 1f32c7b..6316160 100644 > > --- a/fs/udf/udf_sb.h > > +++ b/fs/udf/udf_sb.h > > @@ -3,9 +3,9 @@ > > > > #include <linux/mutex.h> > > #include <linux/bitops.h> > > +#include <linux/magic.h> > > > > /* Since UDF 2.01 is ISO 13346 based... */ > > -#define UDF_SUPER_MAGIC 0x15013346 > The comment refers to the magic so delete it as well... Otherwise the > patch looks OK. ... meaning you can add Acked-by: Jan Kara <jack@xxxxxxx> I could take the patch if you prefer that but I guess you'll merge the whole series at once, right? Honza > > #define UDF_MAX_READ_VERSION 0x0250 > > #define UDF_MAX_WRITE_VERSION 0x0201 > > diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h > > index a042445..aae1070 100644 > > --- a/include/uapi/linux/magic.h > > +++ b/include/uapi/linux/magic.h > > @@ -48,6 +48,7 @@ > > #define HOSTFS_SUPER_MAGIC 0x00c0ffee > > #define HPPFS_SUPER_MAGIC 0xb00000ee > > #define UBIFS_SUPER_MAGIC 0x24051905 > > +#define UDF_SUPER_MAGIC 0x15013346 > > #define VXFS_SUPER_MAGIC 0xa501FCF5 > > #define XFS_SUPER_MAGIC 0x58465342 > > > > -- > > 1.8.5.3 > > > -- > Jan Kara <jack@xxxxxxx> > SUSE Labs, CR -- Jan Kara <jack@xxxxxxx> SUSE Labs, CR -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
