From patchwork Tue Jul 10 00:10:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Vorontsov X-Patchwork-Id: 9911 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 155BB23E01 for ; Tue, 10 Jul 2012 00:13:19 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id C2E2AA18757 for ; Tue, 10 Jul 2012 00:13:18 +0000 (UTC) Received: by ggnf1 with SMTP id f1so11489161ggn.11 for ; Mon, 09 Jul 2012 17:13:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=0mx8YuI9XVqyKO+uobTj9Xl8Twe1XKIoKta93mpvAho=; b=GXA0tS09AWsmp2gXP/SJt6slPsrHM6YlowQFZPhXkGlkKGSOxmlf25/BeUhqQEhucW fcSYCe7OOLGk5Sxdbkl9rsVMiRezOoHJTBeLPCJSmWGM49NUG/lT/GZX1uBgmNk799oD zzzMHUjIBtP+sGWpxTVnej6MY9GAC+EsvZF2R/2eBQp/c2i4gVazctKi8VUxi04X/Ghp ttzkbeWfeG8YBEjjwvpyWr7XFmTttWxoZ+QkiqgIo/NeIrLzrbVECHcUzoxPPlwsOJBu BPcwW7aU6wuWqzujkYnuQC0Hwk+SySlNKve9UVVCYoomknq161nge/c96VPMTdX4y454 0PIw== Received: by 10.50.40.193 with SMTP id z1mr10089834igk.0.1341879198088; Mon, 09 Jul 2012 17:13:18 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp42694ibb; Mon, 9 Jul 2012 17:13:17 -0700 (PDT) Received: by 10.236.77.196 with SMTP id d44mr48423505yhe.44.1341879197297; Mon, 09 Jul 2012 17:13:17 -0700 (PDT) Received: from mail-yw0-f50.google.com (mail-yw0-f50.google.com [209.85.213.50]) by mx.google.com with ESMTPS id d45si11449208yhe.92.2012.07.09.17.13.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 17:13:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) client-ip=209.85.213.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.50 is neither permitted nor denied by best guess record for domain of anton.vorontsov@linaro.org) smtp.mail=anton.vorontsov@linaro.org Received: by mail-yw0-f50.google.com with SMTP id j63so6225232yhj.37 for ; Mon, 09 Jul 2012 17:13:17 -0700 (PDT) Received: by 10.66.78.42 with SMTP id y10mr69310567paw.31.1341879196709; Mon, 09 Jul 2012 17:13:16 -0700 (PDT) Received: from localhost (c-71-204-165-222.hsd1.ca.comcast.net. [71.204.165.222]) by mx.google.com with ESMTPS id ny4sm28639717pbb.57.2012.07.09.17.13.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 17:13:16 -0700 (PDT) From: Anton Vorontsov To: Greg Kroah-Hartman , Kees Cook , Colin Cross , Tony Luck , Steven Rostedt , Frederic Weisbecker , Ingo Molnar Cc: Arnd Bergmann , John Stultz , Shuah Khan , arve@android.com, Rebecca Schultz Zavin , Jesper Juhl , Randy Dunlap , Stephen Boyd , Thomas Meyer , Andrew Morton , Marco Stornelli , WANG Cong , linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, linaro-kernel@lists.linaro.org, patches@linaro.org, kernel-team@android.com Subject: [PATCH 5/8] pstore/ram: Convert to write_buf callback Date: Mon, 9 Jul 2012 17:10:43 -0700 Message-Id: <1341879046-5197-5-git-send-email-anton.vorontsov@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <20120710001004.GA22744@lizard> References: <20120710001004.GA22744@lizard> X-Gm-Message-State: ALoCoQlqFbU7jFNeNE0Y8qzKz5lEZE1H4/FfcWriSkjHiK9Abmx0yjbohWHf3jsBtqSt/uhuymkC Don't use pstore.buf directly, instead convert the code to write_buf callback which passes a pointer to a buffer as an argument. Signed-off-by: Anton Vorontsov --- fs/pstore/ram.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index b39aebb..74f4111 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -170,11 +170,12 @@ static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz) return len; } -static int ramoops_pstore_write(enum pstore_type_id type, - enum kmsg_dump_reason reason, - u64 *id, - unsigned int part, - size_t size, struct pstore_info *psi) + +static int ramoops_pstore_write_buf(enum pstore_type_id type, + enum kmsg_dump_reason reason, + u64 *id, unsigned int part, + const char *buf, size_t size, + struct pstore_info *psi) { struct ramoops_context *cxt = psi->data; struct persistent_ram_zone *prz = cxt->przs[cxt->dump_write_cnt]; @@ -183,7 +184,7 @@ static int ramoops_pstore_write(enum pstore_type_id type, if (type == PSTORE_TYPE_CONSOLE) { if (!cxt->cprz) return -ENOMEM; - persistent_ram_write(cxt->cprz, cxt->pstore.buf, size); + persistent_ram_write(cxt->cprz, buf, size); return 0; } @@ -212,7 +213,7 @@ static int ramoops_pstore_write(enum pstore_type_id type, hlen = ramoops_write_kmsg_hdr(prz); if (size + hlen > prz->buffer_size) size = prz->buffer_size - hlen; - persistent_ram_write(prz, cxt->pstore.buf, size); + persistent_ram_write(prz, buf, size); cxt->dump_write_cnt = (cxt->dump_write_cnt + 1) % cxt->max_dump_cnt; @@ -250,7 +251,7 @@ static struct ramoops_context oops_cxt = { .name = "ramoops", .open = ramoops_pstore_open, .read = ramoops_pstore_read, - .write = ramoops_pstore_write, + .write_buf = ramoops_pstore_write_buf, .erase = ramoops_pstore_erase, }, };