From patchwork Mon Jul 12 14:50:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 58618 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 D4E03B6F16 for ; Tue, 13 Jul 2010 00:51:24 +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 1OYKLl-0002RI-I3; Mon, 12 Jul 2010 15:51:17 +0100 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYKLi-0002QI-TA for kernel-team@lists.ubuntu.com; Mon, 12 Jul 2010 15:51:16 +0100 Received: from [10.0.2.5] (unknown [10.0.2.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id D630E1D1A7; Mon, 12 Jul 2010 07:50:02 -0700 (PDT) Message-ID: <4C3B2BCF.4010703@canonical.com> Date: Mon, 12 Jul 2010 08:50:55 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5 MIME-Version: 1.0 To: Scott James Remnant Subject: ureadahead Maverick patch for buffer_size_kb Cc: Kernel team list X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: tim.gardner@canonical.com List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Scott, Is this the right changelog version for Maverick? Since you're upstream, are you keeping changes in an SCM repository somewhere? rtg 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,10 @@ +ureadahead (0.100.0-5ubuntu1) maverick; urgency=low + + * Restore buffer_size_kb upon exit. + - #LP: 501715 + + -- Tim Gardner Mon, 12 Jul 2010 14:39:48 +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))