diff mbox

: Remove incompatible pointer assignment warning in ext4 quota operations

Message ID ea11fea30901272121x319aa2b3m2a5a5799b6df4d8a@mail.gmail.com
State Not Applicable, archived
Headers show

Commit Message

Manish Katiyar Jan. 28, 2009, 5:21 a.m. UTC
On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
> Below patch removes the following warning during compilation :
>
>  CC [M]  fs/ext4/super.o
> fs/ext4/super.c:949: warning: initialization from incompatible pointer type
>  LD [M]  fs/ext4/ext4.o

Sorry,

Tha correct patch is here.

Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
---
 fs/ext4/ext4.h  |    2 +-
 fs/ext4/inode.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Manish Katiyar Jan. 30, 2009, 3 p.m. UTC | #1
On Wed, Jan 28, 2009 at 10:51 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
> On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
>> Below patch removes the following warning during compilation :
>>
>>  CC [M]  fs/ext4/super.o
>> fs/ext4/super.c:949: warning: initialization from incompatible pointer type
>>  LD [M]  fs/ext4/ext4.o

Hi Ted,

Any feedback on this ?

Thanks -
Manish

>
> Sorry,
>
> Tha correct patch is here.
>
> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
> ---
>  fs/ext4/ext4.h  |    2 +-
>  fs/ext4/inode.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 3ab1a41..0164866 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -1088,7 +1088,7 @@ extern int ext4_chunk_trans_blocks(struct inode
> *, int nrblocks);
>  extern int ext4_block_truncate_page(handle_t *handle,
>                struct address_space *mapping, loff_t from);
>  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
> -extern unsigned long long ext4_get_reserved_space(struct inode *inode);
> +extern qsize_t ext4_get_reserved_space(struct inode *inode);
>
>  /* ioctl.c */
>  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 6a316ec..6be09be 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -973,9 +973,9 @@ out:
>        return err;
>  }
>
> -unsigned long long ext4_get_reserved_space(struct inode *inode)
> +qsize_t ext4_get_reserved_space(struct inode *inode)
>  {
> -       unsigned long long total;
> +       qsize_t total;
>
>        spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
>        total = EXT4_I(inode)->i_reserved_data_blocks +
> --
> 1.5.4.3
>
> Thanks -
> Manish
>
>>
>>
>> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
>> ---
>>  fs/ext4/ext4.h |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
>> index 3ab1a41..0164866 100644
>> --- a/fs/ext4/ext4.h
>> +++ b/fs/ext4/ext4.h
>> @@ -1088,7 +1088,7 @@ extern int ext4_chunk_trans_blocks(struct inode
>> *, int nrblocks);
>>  extern int ext4_block_truncate_page(handle_t *handle,
>>                struct address_space *mapping, loff_t from);
>>  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
>> -extern unsigned long long ext4_get_reserved_space(struct inode *inode);
>> +extern qsize_t ext4_get_reserved_space(struct inode *inode);
>>
>>  /* ioctl.c */
>>  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
>> --
>> 1.5.4.3
>>
>>
>> Thanks -
>> Manish
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Kara Feb. 2, 2009, 4:10 p.m. UTC | #2
> On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
> > Below patch removes the following warning during compilation :
> >
> >  CC [M]  fs/ext4/super.o
> > fs/ext4/super.c:949: warning: initialization from incompatible pointer type
> >  LD [M]  fs/ext4/ext4.o
> 
> Sorry,
> 
> Tha correct patch is here.
> 
> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
  Looks fine to me.
Acked-by: Jan Kara <jack@suse.cz>

										Honza

> ---
>  fs/ext4/ext4.h  |    2 +-
>  fs/ext4/inode.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 3ab1a41..0164866 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -1088,7 +1088,7 @@ extern int ext4_chunk_trans_blocks(struct inode
> *, int nrblocks);
>  extern int ext4_block_truncate_page(handle_t *handle,
>  		struct address_space *mapping, loff_t from);
>  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
> -extern unsigned long long ext4_get_reserved_space(struct inode *inode);
> +extern qsize_t ext4_get_reserved_space(struct inode *inode);
> 
>  /* ioctl.c */
>  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 6a316ec..6be09be 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -973,9 +973,9 @@ out:
>  	return err;
>  }
> 
> -unsigned long long ext4_get_reserved_space(struct inode *inode)
> +qsize_t ext4_get_reserved_space(struct inode *inode)
>  {
> -	unsigned long long total;
> +	qsize_t total;
> 
>  	spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
>  	total = EXT4_I(inode)->i_reserved_data_blocks +
> -- 
> 1.5.4.3
> 
> Thanks -
> Manish
> 
> >
> >
> > Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
> > ---
> >  fs/ext4/ext4.h |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> > index 3ab1a41..0164866 100644
> > --- a/fs/ext4/ext4.h
> > +++ b/fs/ext4/ext4.h
> > @@ -1088,7 +1088,7 @@ extern int ext4_chunk_trans_blocks(struct inode
> > *, int nrblocks);
> >  extern int ext4_block_truncate_page(handle_t *handle,
> >                struct address_space *mapping, loff_t from);
> >  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
> > -extern unsigned long long ext4_get_reserved_space(struct inode *inode);
> > +extern qsize_t ext4_get_reserved_space(struct inode *inode);
> >
> >  /* ioctl.c */
> >  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
> > --
> > 1.5.4.3
> >
> >
> > Thanks -
> > Manish
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Manish Katiyar Feb. 12, 2009, 8:54 a.m. UTC | #3
On Mon, Feb 2, 2009 at 9:40 PM, Jan Kara <jack@suse.cz> wrote:
>> On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
>> > Below patch removes the following warning during compilation :
>> >
>> >  CC [M]  fs/ext4/super.o
>> > fs/ext4/super.c:949: warning: initialization from incompatible pointer type
>> >  LD [M]  fs/ext4/ext4.o
>>
>> Sorry,
>>
>> Tha correct patch is here.
>>
>> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
>  Looks fine to me.
> Acked-by: Jan Kara <jack@suse.cz>

Hi Jan,

A simple doubt. Patches acked by you will be automatically picked up
or will I have to resend it with your ack added ??

Thanks -
Manish

>
>                                                                                Honza
>
>> ---
>>  fs/ext4/ext4.h  |    2 +-
>>  fs/ext4/inode.c |    4 ++--
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
>> index 3ab1a41..0164866 100644
>> --- a/fs/ext4/ext4.h
>> +++ b/fs/ext4/ext4.h
>> @@ -1088,7 +1088,7 @@ extern int ext4_chunk_trans_blocks(struct inode
>> *, int nrblocks);
>>  extern int ext4_block_truncate_page(handle_t *handle,
>>               struct address_space *mapping, loff_t from);
>>  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
>> -extern unsigned long long ext4_get_reserved_space(struct inode *inode);
>> +extern qsize_t ext4_get_reserved_space(struct inode *inode);
>>
>>  /* ioctl.c */
>>  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
>> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
>> index 6a316ec..6be09be 100644
>> --- a/fs/ext4/inode.c
>> +++ b/fs/ext4/inode.c
>> @@ -973,9 +973,9 @@ out:
>>       return err;
>>  }
>>
>> -unsigned long long ext4_get_reserved_space(struct inode *inode)
>> +qsize_t ext4_get_reserved_space(struct inode *inode)
>>  {
>> -     unsigned long long total;
>> +     qsize_t total;
>>
>>       spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
>>       total = EXT4_I(inode)->i_reserved_data_blocks +
>> --
>> 1.5.4.3
>>
>> Thanks -
>> Manish
>>
>> >
>> >
>> > Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
>> > ---
>> >  fs/ext4/ext4.h |    2 +-
>> >  1 files changed, 1 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
>> > index 3ab1a41..0164866 100644
>> > --- a/fs/ext4/ext4.h
>> > +++ b/fs/ext4/ext4.h
>> > @@ -1088,7 +1088,7 @@ extern int ext4_chunk_trans_blocks(struct inode
>> > *, int nrblocks);
>> >  extern int ext4_block_truncate_page(handle_t *handle,
>> >                struct address_space *mapping, loff_t from);
>> >  extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
>> > -extern unsigned long long ext4_get_reserved_space(struct inode *inode);
>> > +extern qsize_t ext4_get_reserved_space(struct inode *inode);
>> >
>> >  /* ioctl.c */
>> >  extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
>> > --
>> > 1.5.4.3
>> >
>> >
>> > Thanks -
>> > Manish
>> >
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> Jan Kara <jack@suse.cz>
> SuSE CR Labs
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Y. Ts'o Feb. 12, 2009, 11:47 a.m. UTC | #4
On Thu, Feb 12, 2009 at 02:24:17PM +0530, Manish Katiyar wrote:
> On Mon, Feb 2, 2009 at 9:40 PM, Jan Kara <jack@suse.cz> wrote:
> >> On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
> >> > Below patch removes the following warning during compilation :
> >> >
> >> >  CC [M]  fs/ext4/super.o
> >> > fs/ext4/super.c:949: warning: initialization from incompatible pointer type
> >> >  LD [M]  fs/ext4/ext4.o
> >>
> >> Sorry,
> >>
> >> Tha correct patch is here.
> >>
> >> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
> >  Looks fine to me.
> > Acked-by: Jan Kara <jack@suse.cz>
> 
> Hi Jan,
> 
> A simple doubt. Patches acked by you will be automatically picked up
> or will I have to resend it with your ack added ??

Actually, in this case Jan should pick up the patch and merge it with
Mingming's ext4 quota patch which is being carried in his tree.  The
current ext4 code doesn't have ext4_get_reserved_space() at all.

							- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jan Kara Feb. 12, 2009, 2:22 p.m. UTC | #5
On Thu 12-02-09 14:24:17, Manish Katiyar wrote:
> On Mon, Feb 2, 2009 at 9:40 PM, Jan Kara <jack@suse.cz> wrote:
> >> On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar <mkatiyar@gmail.com> wrote:
> >> > Below patch removes the following warning during compilation :
> >> >
> >> >  CC [M]  fs/ext4/super.o
> >> > fs/ext4/super.c:949: warning: initialization from incompatible pointer type
> >> >  LD [M]  fs/ext4/ext4.o
> >>
> >> Sorry,
> >>
> >> Tha correct patch is here.
> >>
> >> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
> >  Looks fine to me.
> > Acked-by: Jan Kara <jack@suse.cz>
> 
> Hi Jan,
> 
> A simple doubt. Patches acked by you will be automatically picked up
> or will I have to resend it with your ack added ??
  Ah, I realized that probably I should merge this patch since I carry the
ext4 quota reservation patch... Thanks for the reminder. But when I tried
to merge your patch I've found that the warning is already fixed in my tree
by some other patch. I'm sorry. Thanks for your work.

									Honza
diff mbox

Patch

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 3ab1a41..0164866 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1088,7 +1088,7 @@  extern int ext4_chunk_trans_blocks(struct inode
*, int nrblocks);
 extern int ext4_block_truncate_page(handle_t *handle,
 		struct address_space *mapping, loff_t from);
 extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct page *page);
-extern unsigned long long ext4_get_reserved_space(struct inode *inode);
+extern qsize_t ext4_get_reserved_space(struct inode *inode);

 /* ioctl.c */
 extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 6a316ec..6be09be 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -973,9 +973,9 @@  out:
 	return err;
 }

-unsigned long long ext4_get_reserved_space(struct inode *inode)
+qsize_t ext4_get_reserved_space(struct inode *inode)
 {
-	unsigned long long total;
+	qsize_t total;

 	spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
 	total = EXT4_I(inode)->i_reserved_data_blocks +