From patchwork Thu Jul 8 16:24:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 58256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 70A3FB6F05 for ; Fri, 9 Jul 2010 02:25:05 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OWtuD-0006qc-AB; Thu, 08 Jul 2010 17:24:57 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OWtuB-0006qH-6N for kernel-team@lists.ubuntu.com; Thu, 08 Jul 2010 17:24:55 +0100 Received: from sepang.rtg.net (unknown [10.0.2.5]) by mail.tpi.com (Postfix) with ESMTP id 33BC4254600; Thu, 8 Jul 2010 09:23:37 -0700 (PDT) Received: by sepang.rtg.net (Postfix, from userid 1000) id ADD40F891E; Thu, 8 Jul 2010 10:24:42 -0600 (MDT) To: apw@canonical.com Subject: ureadahead patch Message-Id: <20100708162442.ADD40F891E@sepang.rtg.net> Date: Thu, 8 Jul 2010 10:24:42 -0600 (MDT) From: timg@tpi.com (Tim Gardner) Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com diff -u ureadahead-0.100.0/debian/changelog ureadahead-0.100.0/debian/changelog --- ureadahead-0.100.0/debian/changelog +++ ureadahead-0.100.0/debian/changelog @@ -1,3 +1,9 @@ +ureadahead (0.100.0-5ubuntu1) maverick; urgency=low + + * + + -- Tim Gardner Thu, 08 Jul 2010 16:04:39 +0000 + ureadahead (0.100.0-5) maverick; urgency=low * src/pack.c: Amend mount point detection logic to stat the mount point only in patch2: unchanged: --- ureadahead-0.100.0.orig/src/trace.c +++ ureadahead-0.100.0/src/trace.c @@ -122,6 +122,7 @@ int old_open_exec_enabled = 0; int old_uselib_enabled = 0; int old_tracing_enabled = 0; + int old_buffer_size_kb = 0; struct sigaction act; struct sigaction old_sigterm; struct sigaction old_sigint; @@ -165,7 +166,7 @@ old_uselib_enabled = -1; } - if (set_value (dfd, "buffer_size_kb", 128000, NULL) < 0) + if (set_value (dfd, "buffer_size_kb", 128000, &old_buffer_size_kb) < 0) goto error; if (set_value (dfd, "tracing_enabled", TRUE, &old_tracing_enabled) < 0) @@ -217,6 +218,9 @@ if (set_value (dfd, "events/fs/do_sys_open/enable", old_sys_open_enabled, NULL) < 0) goto error; + if (set_value (dfd, "buffer_size_kb", + old_buffer_size_kb, NULL) < 0) + goto error; /* Be nicer */ if (nice (15))