Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999Ab0KZAgW (ORCPT ); Thu, 25 Nov 2010 19:36:22 -0500 Received: from ping.uio.no ([193.157.115.196]:45967 "EHLO ping.uio.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752802Ab0KZAgU (ORCPT ); Thu, 25 Nov 2010 19:36:20 -0500 Date: Fri, 26 Nov 2010 01:36:13 +0100 From: Morten Hustveit To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Andreas Dilger Subject: [PATCH v2] fcntl: Add the F_READAHEAD command Message-ID: <20101126003613.GA2026@ping.uio.no> References: <20101125095437.GA3409@ping.uio.no> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17+20080114 (2008-01-14) X-Exiscan-Spam-Score: -5.0 (-----) X-Exiscan-Spam-Report: SpamAssassin 3.2.5 (2008-06-10) on rossum.ping.uio.no Score Rule * -5.0 PING_UIO_MAIL_IS_INTERNAL Message has never been outside * 129.240.0.0/16 or 193.157.115.0/24 * -0.0 NO_RELAYS Informational: message was not relayed via SMTP Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2348 Lines: 83 Allow userland applications to control the read-ahead per file descriptor. For example, this interface can be used to adjust read sizes in applications using sendfile() to serve many streams from disk. The implementation is based on sys_readahead() and sys_fadvise64(). The same interface was added to FreeBSD in 2009. Signed-off-by: Morten Hustveit --- Changes for v2: - Renamed "arg" to "ra_bytes". "ra_bytes" was used instead of "readahead_bytes" to keep lines at less than 80 columns, and to be consistent with "ra_pages". diff --git a/fs/fcntl.c b/fs/fcntl.c index ecc8b39..9d78274 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -340,6 +340,31 @@ static int f_getown_ex(struct file *filp, unsigned long arg) return ret; } +static int f_readahead(struct file *filp, unsigned long ra_bytes) +{ + struct address_space *mapping; + + mapping = filp->f_mapping; + if (!mapping || !mapping->a_ops || !mapping->a_ops->readpage) + return -EINVAL; + + if (mapping->a_ops->get_xip_mem) + return 0; + + if (ra_bytes) { + filp->f_ra.ra_pages = (ra_bytes + PAGE_SIZE - 1) >> PAGE_SHIFT; + spin_lock(&filp->f_lock); + filp->f_mode &= ~FMODE_RANDOM; + spin_unlock(&filp->f_lock); + } else { + spin_lock(&filp->f_lock); + filp->f_mode |= FMODE_RANDOM; + spin_unlock(&filp->f_lock); + } + + return 0; +} + static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, struct file *filp) { @@ -420,6 +445,9 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, case F_GETPIPE_SZ: err = pipe_fcntl(filp, cmd, arg); break; + case F_READAHEAD: + err = f_readahead(filp, arg); + break; default: break; } diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h index afc00af..69d8e4d 100644 --- a/include/linux/fcntl.h +++ b/include/linux/fcntl.h @@ -28,6 +28,11 @@ #define F_GETPIPE_SZ (F_LINUX_SPECIFIC_BASE + 8) /* + * Set read-ahead buffer size + */ +#define F_READAHEAD (F_LINUX_SPECIFIC_BASE + 9) + +/* * Types of directory notifications that may be requested. */ #define DN_ACCESS 0x00000001 /* File accessed */ -- 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/