From patchwork Wed Jan 28 05:21:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Katiyar X-Patchwork-Id: 20565 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 1CF4DDDFE4 for ; Wed, 28 Jan 2009 16:21:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750740AbZA1FVm (ORCPT ); Wed, 28 Jan 2009 00:21:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750814AbZA1FVm (ORCPT ); Wed, 28 Jan 2009 00:21:42 -0500 Received: from ti-out-0910.google.com ([209.85.142.185]:30656 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750740AbZA1FVl (ORCPT ); Wed, 28 Jan 2009 00:21:41 -0500 Received: by ti-out-0910.google.com with SMTP id b6so3429141tic.23 for ; Tue, 27 Jan 2009 21:21:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=ftmVKAFwOgaxlPdpTt5IMeLYJdehBkk75wRDTpfCi8o=; b=bFuBDuIrBfp2Qr6k65b/9uX1o0fysDY44a5toNPduHoEHWCdsZlfXmvmv/LYRTSSvX R4LsO5Ror9iRBEEVrkSiYxAUWxFM0r7u7kHTDa//RcHpVCdHf96x0H+ufc3wTnzcTztb aqagzZNbhW0htSQTIdooC0qKAtFE3I8rIbqMQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Di1nDJNXbrl7AC4eycnj8SAHI0DS2xAxzs1nkUZiYx8Ys9gSMrXRjuueThb7K5F53T jI7AzzV8ZHQYptUh/JGh3YBagTiAqjTHtEliG1i516+x+kRcrYqDpEHA59l6NebYLmbV lGzZFbrdI5C5UpXyfa9m5o4eo/FGlNof70C8w= MIME-Version: 1.0 Received: by 10.110.105.5 with SMTP id d5mr11580714tic.42.1233120099210; Tue, 27 Jan 2009 21:21:39 -0800 (PST) In-Reply-To: References: Date: Wed, 28 Jan 2009 10:51:39 +0530 Message-ID: Subject: Re: [PATCH] : Remove incompatible pointer assignment warning in ext4 quota operations From: Manish Katiyar To: "Theodore Ts'o" , ext4 Cc: mkatiyar@gmail.com Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Wed, Jan 28, 2009 at 10:47 AM, Manish Katiyar 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 Acked-by: Jan Kara --- 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 +