From mboxrd@z Thu Jan 1 00:00:00 1970 From: Denys Vlasenko Subject: [PATCH] (resend) reuse xxx_fifo_fops for xxx_pipe_fops Date: Tue, 1 Jul 2008 11:03:02 +0200 Message-ID: <200807011103.02974.vda.linux@googlemail.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_GLfaI5W6cfG0n6G" Cc: Al Viro , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org To: Andrew Morton Return-path: Received: from fk-out-0910.google.com ([209.85.128.189]:32922 "EHLO fk-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754805AbYGAHCt (ORCPT ); Tue, 1 Jul 2008 03:02:49 -0400 Received: by fk-out-0910.google.com with SMTP id 18so1723744fkq.5 for ; Tue, 01 Jul 2008 00:02:47 -0700 (PDT) Sender: linux-fsdevel-owner@vger.kernel.org List-ID: --Boundary-00=_GLfaI5W6cfG0n6G Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Andrew, Al, I posted this patch a few months ago, but it apparently fell thru cracks. Here we go again. I noticed that read/write/rdwr_pipe_fops are (1) const and (2) exactly identical to xxx_fifo_fops, which are also const. Attached patch #defines xxx_pipe_fops as aliases to xxx_fifo_fops. Size difference: # size linux-2.6.25-rc6*/*/pipe.o text data bss dec hex filename 6534 144 0 6678 1a16 linux-2.6.25-rc6/fs/pipe.o 5862 144 0 6006 1776 linux-2.6.25-rc6-pt/fs/pipe.o Run-tested on 2.6.26-rc8. Please apply. Signed-off-by: Denys Vlasenko -- vda --Boundary-00=_GLfaI5W6cfG0n6G Content-Type: text/x-diff; charset="us-ascii"; name="reuse_fifo_ops_for_pipe_ops.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="reuse_fifo_ops_for_pipe_ops.diff" --- linux-2.6.25-rc6.src/fs/pipe.c Sat Mar 22 23:00:34 2008 +++ linux-2.6.25-rc6.pipe/fs/pipe.c Fri Mar 28 15:52:00 2008 @@ -814,42 +814,9 @@ .fasync = pipe_rdwr_fasync, }; -static const struct file_operations read_pipe_fops = { - .llseek = no_llseek, - .read = do_sync_read, - .aio_read = pipe_read, - .write = bad_pipe_w, - .poll = pipe_poll, - .unlocked_ioctl = pipe_ioctl, - .open = pipe_read_open, - .release = pipe_read_release, - .fasync = pipe_read_fasync, -}; - -static const struct file_operations write_pipe_fops = { - .llseek = no_llseek, - .read = bad_pipe_r, - .write = do_sync_write, - .aio_write = pipe_write, - .poll = pipe_poll, - .unlocked_ioctl = pipe_ioctl, - .open = pipe_write_open, - .release = pipe_write_release, - .fasync = pipe_write_fasync, -}; - -static const struct file_operations rdwr_pipe_fops = { - .llseek = no_llseek, - .read = do_sync_read, - .aio_read = pipe_read, - .write = do_sync_write, - .aio_write = pipe_write, - .poll = pipe_poll, - .unlocked_ioctl = pipe_ioctl, - .open = pipe_rdwr_open, - .release = pipe_rdwr_release, - .fasync = pipe_rdwr_fasync, -}; +#define read_pipe_fops read_fifo_fops +#define write_pipe_fops write_fifo_fops +#define rdwr_pipe_fops rdwr_fifo_fops struct pipe_inode_info * alloc_pipe_info(struct inode *inode) { --Boundary-00=_GLfaI5W6cfG0n6G--