Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756798AbXIZD2T (ORCPT ); Tue, 25 Sep 2007 23:28:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755232AbXIZD2E (ORCPT ); Tue, 25 Sep 2007 23:28:04 -0400 Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:34566 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754621AbXIZD2B (ORCPT ); Tue, 25 Sep 2007 23:28:01 -0400 From: Erez Zadok To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, viro@ftp.linux.org.uk, hch@infradead.org, Erez Zadok Subject: [PATCH 05/25] Unionfs: cast page->index loff_t before shifting Date: Tue, 25 Sep 2007 23:09:44 -0400 Message-Id: <1190776207595-git-send-email-ezk@cs.sunysb.edu> X-Mailer: git-send-email 1.5.2.2 X-MailKey: Erez_Zadok In-Reply-To: <11907762042481-git-send-email-ezk@cs.sunysb.edu> References: <11907762042481-git-send-email-ezk@cs.sunysb.edu> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1472 Lines: 40 Fixes bugs in number promotion/demotion computation, as per Signed-off-by: Erez Zadok Acked-by: Josef 'Jeff' Sipek --- fs/unionfs/mmap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/unionfs/mmap.c b/fs/unionfs/mmap.c index 88ef6a6..37af979 100644 --- a/fs/unionfs/mmap.c +++ b/fs/unionfs/mmap.c @@ -179,7 +179,8 @@ static int unionfs_do_readpage(struct file *file, struct page *page) * may be a little slower, but a lot safer, as the VFS does a lot of * the necessary magic for us. */ - offset = lower_file->f_pos = (page->index << PAGE_CACHE_SHIFT); + offset = lower_file->f_pos = + ((loff_t) page->index << PAGE_CACHE_SHIFT); old_fs = get_fs(); set_fs(KERNEL_DS); err = vfs_read(lower_file, page_data, PAGE_CACHE_SIZE, @@ -289,7 +290,7 @@ static int unionfs_commit_write(struct file *file, struct page *page, BUG_ON(lower_file == NULL); page_data = (char *)kmap(page); - lower_file->f_pos = (page->index << PAGE_CACHE_SHIFT) + from; + lower_file->f_pos = ((loff_t) page->index << PAGE_CACHE_SHIFT) + from; /* * SP: I use vfs_write instead of copying page data and the -- 1.5.2.2 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/