From patchwork Tue Mar 24 22:12:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengyu Song X-Patchwork-Id: 6086321 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 07553BF90F for ; Tue, 24 Mar 2015 22:26:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 340A1201E4 for ; Tue, 24 Mar 2015 22:26:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23ECF2011E for ; Tue, 24 Mar 2015 22:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752467AbbCXW0O (ORCPT ); Tue, 24 Mar 2015 18:26:14 -0400 Received: from mx2.gtisc.gatech.edu ([143.215.130.82]:57343 "EHLO mx2.gtisc.gatech.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbbCXW0M (ORCPT ); Tue, 24 Mar 2015 18:26:12 -0400 X-Greylist: delayed 591 seconds by postgrey-1.27 at vger.kernel.org; Tue, 24 Mar 2015 18:26:12 EDT Received: from alternative.gtisc.gatech.edu (alternative.gtisc.gatech.edu [143.215.130.208]) by mx2.gtisc.gatech.edu (Postfix) with SMTP id EA6FA1BC15F; Tue, 24 Mar 2015 22:16:17 +0000 (UTC) Received: (nullmailer pid 19530 invoked by uid 1000); Tue, 24 Mar 2015 22:13:03 -0000 From: Chengyu Song To: clm@fb.com, jbacik@fb.com, dsterba@suse.cz, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: taesoo@gatech.edu, changwoo@gatech.edu, sanidhya@gatech.edu, blee@gatech.edu, csong84@gatech.edu Subject: [PATCH 1/1] btrfs: incorrect handling for fiemap_fill_next_extent return Date: Tue, 24 Mar 2015 18:12:56 -0400 Message-Id: <1427235176-19381-1-git-send-email-csong84@gatech.edu> X-Mailer: git-send-email 2.1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@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=ham 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 fiemap_fill_next_extent returns 0 on success, -errno on error, 1 if this was the last extent that will fit in user array. If 1 is returned, the return value may eventually returned to user space, which should not happen, according to manpage of ioctl. Signed-off-by: Chengyu Song Reviewed-by: David Sterba Reviewed-by: Liu Bo --- fs/btrfs/extent_io.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index d688cfe..782f3bc 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -4514,8 +4514,11 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, } ret = fiemap_fill_next_extent(fieinfo, em_start, disko, em_len, flags); - if (ret) + if (ret) { + if (ret == 1) + ret = 0; goto out_free; + } } out_free: free_extent_map(em);