From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933747Ab3GPTKS (ORCPT ); Tue, 16 Jul 2013 15:10:18 -0400 Received: from mga14.intel.com ([143.182.124.37]:33488 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933353Ab3GPTKQ (ORCPT ); Tue, 16 Jul 2013 15:10:16 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.89,678,1367996400"; d="scan'208";a="366226117" Date: Tue, 16 Jul 2013 15:10:10 -0400 From: Matthew Wilcox To: "Kirill A. Shutemov" Cc: Andrea Arcangeli , Andrew Morton , Al Viro , Hugh Dickins , Wu Fengguang , Jan Kara , Mel Gorman , linux-mm@kvack.org, Andi Kleen , "Kirill A. Shutemov" , Hillf Danton , Dave Hansen , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/8] mm: drop actor argument of do_generic_file_read() Message-ID: <20130716191010.GC4855@linux.intel.com> References: <1373885274-25249-1-git-send-email-kirill.shutemov@linux.intel.com> <1373885274-25249-2-git-send-email-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1373885274-25249-2-git-send-email-kirill.shutemov@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 15, 2013 at 01:47:47PM +0300, Kirill A. Shutemov wrote: > From: "Kirill A. Shutemov" > > There's only one caller of do_generic_file_read() and the only actor is > file_read_actor(). No reason to have a callback parameter. > > Signed-off-by: Kirill A. Shutemov > Acked-by: Dave Hansen Would it make sense to do the same thing to do_shmem_file_read()? From: Matthew Wilcox There's only one caller of do_shmem_file_read() and the only actor is file_read_actor(). No reason to have a callback parameter. Signed-off-by: Matthew Wilcox diff --git a/mm/shmem.c b/mm/shmem.c index 5e6a842..6a9c325 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1464,7 +1464,7 @@ shmem_write_end(struct file *file, struct address_space *mapping, return copied; } -static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor) +static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc) { struct inode *inode = file_inode(filp); struct address_space *mapping = inode->i_mapping; @@ -1546,13 +1546,14 @@ static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_ * Ok, we have the page, and it's up-to-date, so * now we can copy it to user space... * - * The actor routine returns how many bytes were actually used.. + * The file_read_actor routine returns how many bytes were actually + * used.. * NOTE! This may not be the same as how much of a user buffer * we filled up (we may be padding etc), so we can only update - * "pos" here (the actor routine has to update the user buffer + * "pos" here (file_read_actor has to update the user buffer * pointers and the remaining count). */ - ret = actor(desc, page, offset, nr); + ret = file_read_actor(desc, page, offset, nr); offset += ret; index += offset >> PAGE_CACHE_SHIFT; offset &= ~PAGE_CACHE_MASK; @@ -1590,7 +1591,7 @@ static ssize_t shmem_file_aio_read(struct kiocb *iocb, if (desc.count == 0) continue; desc.error = 0; - do_shmem_file_read(filp, ppos, &desc, file_read_actor); + do_shmem_file_read(filp, ppos, &desc); retval += desc.written; if (desc.error) { retval = retval ?: desc.error;