From patchwork Wed Jan 21 12:46:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 5676771 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BF4FB9F4DC for ; Wed, 21 Jan 2015 12:47:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ECF1D203B7 for ; Wed, 21 Jan 2015 12:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19A8D202C8 for ; Wed, 21 Jan 2015 12:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148AbbAUMrJ (ORCPT ); Wed, 21 Jan 2015 07:47:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:52356 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752735AbbAUMrG (ORCPT ); Wed, 21 Jan 2015 07:47:06 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 1C0D4ACB0; Wed, 21 Jan 2015 12:47:06 +0000 (UTC) Received: by quack.suse.cz (Postfix, from userid 1000) id 85C1D8294A; Wed, 21 Jan 2015 13:47:05 +0100 (CET) From: Jan Kara To: Al Viro Cc: linux-fsdevel@vger.kernel.org, Andrew Morton , Jan Kara Subject: [PATCH] seq_file: Remove pointless assignment in seq_read() Date: Wed, 21 Jan 2015 13:46:52 +0100 Message-Id: <1421844412-15398-2-git-send-email-jack@suse.cz> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1421844412-15398-1-git-send-email-jack@suse.cz> References: <1421844412-15398-1-git-send-email-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The value assigned to 'err' in seq_read() is overwritten by the result of copy_to_user(). This is correct because we know we have succeeded to generate at least one entry into user buffer so the error we got when generating further entries is irrelevant. Just remove the assignment. Coverity-id: 1226981 Signed-off-by: Jan Kara --- fs/seq_file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/seq_file.c b/fs/seq_file.c index dbf3a59c86bb..548f78308e2a 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -255,10 +255,8 @@ Fill: size_t offs = m->count; loff_t next = pos; p = m->op->next(m, p, &next); - if (!p || IS_ERR(p)) { - err = PTR_ERR(p); + if (!p || IS_ERR(p)) break; - } err = m->op->show(m, p); if (seq_has_overflowed(m) || err) { m->count = offs;