LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Marcin Slusarz <marcin.slusarz@gmail.com>
To: Roel Kluin <12o3l@tiscali.nl>, Evgeniy Dushistov <dushistov@mail.ru>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ufs: [bl]e*_add_cpu conversion
Date: Tue, 19 Feb 2008 18:45:42 +0100	[thread overview]
Message-ID: <20080219174524.GA6096@joi> (raw)
In-Reply-To: <47BA132B.4050005@tiscali.nl>

On Tue, Feb 19, 2008 at 12:22:19AM +0100, Roel Kluin wrote:
> Andrew Morton wrote:
> > On Wed, 13 Feb 2008 10:41:44 +0100 Roel Kluin <12o3l@tiscali.nl> wrote:
> > 
> >> you may also want these:
> >> ---
> >> [bl]e_add_cpu conversion in return
> 
> > upsets powerpc (at least):
> > 
> > fs/ufs/swab.h: In function `fs64_add':
> > fs/ufs/swab.h:47: warning: passing arg 1 of `le64_add_cpu' from incompatible pointer type
> > fs/ufs/swab.h:49: warning: passing arg 1 of `be64_add_cpu' from incompatible pointer type
> > fs/ufs/swab.h: In function `fs64_sub':
> > fs/ufs/swab.h:58: warning: passing arg 1 of `le64_add_cpu' from incompatible pointer type
> > fs/ufs/swab.h:60: warning: passing arg 1 of `be64_add_cpu' from incompatible pointer type
> 
> sorry for this. Is it correct to cast like the patch below does?
I don't think so. Their prototypes are wrong. We can:
a) remove fs64_add and fs64_sub as nobody use them
b) fix them - change second parameter do __fs64 (and convert to [bl]e64_add_cpu)

Evgeniy?

> If not (anyone) feel free to correct and send a patch yourself.
> The patch below was *not* tested
> ---
> [bl]e_add_cpu conversion in return (with cast)
> 
> Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
> ---
> diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
> index 1683d2b..594d6e8 100644
> --- a/fs/ufs/swab.h
> +++ b/fs/ufs/swab.h
> @@ -44,18 +44,22 @@ static __inline u32
>  fs64_add(struct super_block *sbp, u32 *n, int d)
>  {
>  	if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
> -		return *n = cpu_to_le64(le64_to_cpu(*n)+d);
> +		le64_add_cpu((__le64 *)n, d);
>  	else
> -		return *n = cpu_to_be64(be64_to_cpu(*n)+d);
> +		be64_add_cpu((__le64 *)n, d);
> +
> +	return *n;
>  }
>  
>  static __inline u32
>  fs64_sub(struct super_block *sbp, u32 *n, int d)
>  {
>  	if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
> -		return *n = cpu_to_le64(le64_to_cpu(*n)-d);
> +		le64_add_cpu((__le64 *)n, -d);
>  	else
> -		return *n = cpu_to_be64(be64_to_cpu(*n)-d);
> +		be64_add_cpu((__le64 *)n, -d);
> +
> +	return *n;
>  }
>  
>  static __inline u32

  reply	other threads:[~2008-02-19 17:47 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-12 23:06 [PATCHSET] [bl]e*_add_cpu conversions marcin.slusarz
2008-02-12 23:06 ` [PATCH] crypto: be*_add_cpu conversion marcin.slusarz
2008-02-13  8:25   ` Roel Kluin
2008-02-13 18:36     ` Marcin Slusarz
2008-03-14  8:24       ` Herbert Xu
2008-02-12 23:06 ` [PATCH] ieee 1394: " marcin.slusarz
2008-02-16 16:54   ` Stefan Richter
2008-02-12 23:06 ` [PATCH] infiniband: " marcin.slusarz
2008-02-13  0:32   ` Roland Dreier
2008-02-12 23:06 ` [PATCH] affs: " marcin.slusarz
2008-02-12 23:06 ` [PATCH] gfs2: " marcin.slusarz
2008-02-13  9:55   ` Steven Whitehouse
2008-02-12 23:06 ` [PATCH] hfs/hfsplus: " marcin.slusarz
2008-02-12 23:06 ` [PATCH] ipw2200: le*_add_cpu conversion marcin.slusarz
2008-02-13 16:54   ` Chatre, Reinette
2008-02-12 23:06 ` [PATCH] scsi: " marcin.slusarz
2008-02-13 14:06   ` Salyzyn, Mark
2008-02-12 23:06 ` [PATCH] ext2: " marcin.slusarz
2008-02-12 23:06 ` [PATCH] ext4: " marcin.slusarz
2008-02-12 23:06 ` [PATCH] jfs: " marcin.slusarz
2008-02-13 21:51   ` Dave Kleikamp
2008-02-12 23:06 ` [PATCH] ntfs: " marcin.slusarz
2008-02-12 23:06 ` [PATCH] ocfs2: " marcin.slusarz
2008-02-18 21:03   ` Mark Fasheh
2008-02-12 23:06 ` [PATCH] quota: " marcin.slusarz
2008-02-13  9:52   ` Jan Kara
2008-02-12 23:06 ` [PATCH] reiserfs: " marcin.slusarz
2008-02-12 23:06 ` [PATCH] sysv: [bl]e*_add_cpu conversion marcin.slusarz
2008-02-14  7:04   ` Christoph Hellwig
2008-02-16 13:31     ` Christoph Hellwig
2008-02-12 23:06 ` [PATCH] ufs: " marcin.slusarz
2008-02-13  9:41   ` Roel Kluin
2008-02-13 18:21     ` Marcin Slusarz
2008-02-16  5:28     ` Andrew Morton
2008-02-18 23:22       ` Roel Kluin
2008-02-19 17:45         ` Marcin Slusarz [this message]
2008-02-19 19:16           ` Evgeniy Dushistov
2008-03-09 10:21             ` Marcin Slusarz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080219174524.GA6096@joi \
    --to=marcin.slusarz@gmail.com \
    --cc=12o3l@tiscali.nl \
    --cc=akpm@linux-foundation.org \
    --cc=dushistov@mail.ru \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH] ufs: [bl]e*_add_cpu conversion' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).