Re: linux-next: manual merge of the trivial tree with the ext4 tree

Uwe Kleine-König
2010-12-31T16:15:19Z

Hi Stephen,

On Fri, Dec 31, 2010 at 12:57:21PM +1100, Stephen Rothwell wrote:
> diff --cc fs/ext4/ext4.h
> index 2a73925,1f253a9..0000000
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@@ -561,7 -561,23 +561,7 @@@ struct ext4_new_group_data
> #define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION
> #endif
>
> - /* Max physical block we can addres w/o extents */
> -
> -/*
> - * Mount options
> - */
> -struct ext4_mount_options {
> - unsigned long s_mount_opt;
> - uid_t s_resuid;
> - gid_t s_resgid;
> - unsigned long s_commit_interval;
> - u32 s_min_batch_time, s_max_batch_time;
> -#ifdef CONFIG_QUOTA
> - int s_jquota_fmt;
> - char *s_qf_names[MAXQUOTAS];
> -#endif
> -};
> -
> + /* Max physical block we can address w/o extents */
> #define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF
>
> /*
>
Looks correct.

Independant of this I think it would be better to define
EXT4_MAX_BLOCK_FILE_PHYS to 0xFFFFFFFFUL to have the same type on all
platforms.

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |