Re: [PATCH] udf: fix default mode and dmode options handling

Jan Kara
2008-12-02T13:38:06Z

On Tue 02-12-08 00:22:31, Marcin Slusarz wrote:
> On Mon, Dec 01, 2008 at 08:28:02PM +0100, Laurent Riffard wrote:
> > >> With next-2008-11-28, I was unable to mount an UDF-formatted DVD-RW:
> > > Can you check whether attached patch fixes it?
> > Current kernel is next-20081128 + reiser4 patches + your patch: it seems to works well now.
> > (...)
> > Tested-by: Laurent Riffard <laurent.riffard@free.fr>
>
> Thanks!
>
> Jan, please apply this patch:
OK, committed.

Honza

> ---
> From: Marcin Slusarz <marcin.slusarz@gmail.com>
> Subject: [PATCH] udf: fix default mode and dmode options handling
>
> On x86 (and several other archs) mode_t is defined as "unsigned short"
> and comparing unsigned shorts to negative ints is broken (because short
> is promoted to int and then compared). Fix it.
>
> Reported-and-tested-by: Laurent Riffard <laurent.riffard@free.fr>
> Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
> ---
> fs/udf/inode.c | 4 ++--
> fs/udf/super.c | 8 ++++----
> fs/udf/udf_sb.h | 2 ++
> 3 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/fs/udf/inode.c b/fs/udf/inode.c
> index 6612a27..2d7e56a 100644
> --- a/fs/udf/inode.c
> +++ b/fs/udf/inode.c
> @@ -1222,10 +1222,10 @@ static void udf_fill_inode(struct inode *inode, struct buffer_head *bh)
> iinfo->i_lenExtents = inode->i_size;
>
> if (fe->icbTag.fileType != ICBTAG_FILE_TYPE_DIRECTORY &&
> - sbi->s_fmode != -1)
> + sbi->s_fmode != UDF_INVALID_MODE)
> inode->i_mode = sbi->s_fmode;
> else if (fe->icbTag.fileType == ICBTAG_FILE_TYPE_DIRECTORY &&
> - sbi->s_dmode != -1)
> + sbi->s_dmode != UDF_INVALID_MODE)
> inode->i_mode = sbi->s_dmode;
> else
> inode->i_mode = udf_convert_permissions(fe);
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index e5d121d..8deaa61 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -284,9 +284,9 @@ static int udf_show_options(struct seq_file *seq, struct vfsmount *mnt)
> seq_printf(seq, ",gid=%u", sbi->s_gid);
> if (sbi->s_umask != 0)
> seq_printf(seq, ",umask=%o", sbi->s_umask);
> - if (sbi->s_fmode != -1)
> + if (sbi->s_fmode != UDF_INVALID_MODE)
> seq_printf(seq, ",mode=%o", sbi->s_fmode);
> - if (sbi->s_dmode != -1)
> + if (sbi->s_dmode != UDF_INVALID_MODE)
> seq_printf(seq, ",dmode=%o", sbi->s_dmode);
> if (UDF_QUERY_FLAG(sb, UDF_FLAG_SESSION_SET))
> seq_printf(seq, ",session=%u", sbi->s_session);
> @@ -1894,8 +1894,8 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
> uopt.uid = -1;
> uopt.gid = -1;
> uopt.umask = 0;
> - uopt.fmode = -1;
> - uopt.dmode = -1;
> + uopt.fmode = UDF_INVALID_MODE;
> + uopt.dmode = UDF_INVALID_MODE;
>
> sbi = kzalloc(sizeof(struct udf_sb_info), GFP_KERNEL);
> if (!sbi)
> diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
> index 5d32c60..158221e 100644
> --- a/fs/udf/udf_sb.h
> +++ b/fs/udf/udf_sb.h
> @@ -48,6 +48,8 @@
> #define UDF_SPARABLE_MAP15 0x1522U
> #define UDF_METADATA_MAP25 0x2511U
>
> +#define UDF_INVALID_MODE ((mode_t)-1)
> +
> #pragma pack(1) /* XXX(hch): Why? This file just defines in-core structures */
>
> struct udf_meta_data {
> --
> 1.5.6.4
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR