From patchwork Mon Jun 21 06:37:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ma X-Patchwork-Id: 107137 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5L6caw0023449 for ; Mon, 21 Jun 2010 06:38:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751221Ab0FUGiS (ORCPT ); Mon, 21 Jun 2010 02:38:18 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:21688 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751104Ab0FUGiR (ORCPT ); Mon, 21 Jun 2010 02:38:17 -0400 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o5L6cF7s002624 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Jun 2010 06:38:16 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o5L6cErJ012084; Mon, 21 Jun 2010 06:38:14 GMT Received: from abhmt007.oracle.com by acsmt355.oracle.com with ESMTP id 358958441277102238; Sun, 20 Jun 2010 23:37:18 -0700 Received: from localhost.localdomain (/10.182.120.191) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sun, 20 Jun 2010 23:37:17 -0700 From: Tao Ma To: linux-btrfs@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Tao Ma , Chris Mason Subject: [PATCH RESEND] btrfs: Don't return extent in fiemap if we meet with a hole. Date: Mon, 21 Jun 2010 14:37:02 +0800 Message-Id: <1277102222-3310-1-git-send-email-tao.ma@oracle.com> X-Mailer: git-send-email 1.7.0.4 X-Auth-Type: Internal IP X-Source-IP: rcsinet13.oracle.com [148.87.113.125] X-CT-RefId: str=0001.0A090204.4C1F08D9.0007:SCFMA4539811,ss=1,fgs=0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 21 Jun 2010 06:38:37 +0000 (UTC) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index b177ed3..7eb4d77 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2951,7 +2951,7 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 disko = 0; struct extent_map *em = NULL; struct extent_state *cached_state = NULL; - int end = 0; + int end = 0, hole = 0; u64 em_start = 0, em_len = 0; unsigned long emflags; ret = 0; @@ -2978,12 +2978,13 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, disko = 0; flags = 0; + hole = 0; if (em->block_start == EXTENT_MAP_LAST_BYTE) { end = 1; flags |= FIEMAP_EXTENT_LAST; } else if (em->block_start == EXTENT_MAP_HOLE) { - flags |= FIEMAP_EXTENT_UNWRITTEN; + hole = 1; } else if (em->block_start == EXTENT_MAP_INLINE) { flags |= (FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED); @@ -3015,10 +3016,12 @@ int extent_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, end = 1; } - ret = fiemap_fill_next_extent(fieinfo, em_start, disko, - em_len, flags); - if (ret) - goto out_free; + if (!hole) { + ret = fiemap_fill_next_extent(fieinfo, em_start, disko, + em_len, flags); + if (ret) + goto out_free; + } } out_free: free_extent_map(em);