From: Andreas Dilger Subject: Re: [PATCH 4/5] ext4: implement ext4_fiemap Date: Sun, 25 May 2008 01:51:39 -0600 Message-ID: <20080525075139.GJ3516@webber.adilger.int> References: <20080525000224.GN8325@wotan.suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7BIT Cc: linux-fsdevel@vger.kernel.org, Eric Sandeen To: Mark Fasheh Return-path: Received: from sca-es-mail-1.Sun.COM ([192.18.43.132]:41408 "EHLO sca-es-mail-1.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752394AbYEYHvm (ORCPT ); Sun, 25 May 2008 03:51:42 -0400 Received: from fe-sfbay-10.sun.com ([192.18.43.129]) by sca-es-mail-1.sun.com (8.13.7+Sun/8.12.9) with ESMTP id m4P7pfZW008909 for ; Sun, 25 May 2008 00:51:41 -0700 (PDT) Received: from conversion-daemon.fe-sfbay-10.sun.com by fe-sfbay-10.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) id <0K1E00701YUG9Q00@fe-sfbay-10.sun.com> (original mail from adilger@sun.com) for linux-fsdevel@vger.kernel.org; Sun, 25 May 2008 00:51:41 -0700 (PDT) In-reply-to: <20080525000224.GN8325@wotan.suse.de> Content-disposition: inline Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On May 24, 2008 17:02 -0700, Mark Fasheh wrote: > +#define EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP (FIEMAP_FLAG_INCOMPAT & \ > + ~(FIEMAP_FLAG_LUN_OFFSET)) Per discussion with Eric, this needs to be changed: #define EXT4_FIEMAP_FLAG_SUPP (FIEMAP_FLAG_NUM_EXTENTS | FIEMAP_FLAG_SYNC | \ FIEMAP_FLAG_HSM_READ | FIEMAP_FLAG_LUN_ORDER) > +struct fiemap_internal { > + struct fiemap *fiemap_s; > + struct fiemap_extent fm_extent; > + char *cur_ext_ptr; > + int err; > +}; This is no longer used and can be removed (now uses fiemap_extent_info). > +/* > + * Callback function called for each extent to gather FIEMAP information. > + */ > +int ext4_ext_fiemap_cb(struct inode *inode, struct ext4_ext_path *path, > + struct ext4_ext_cache *newex, struct ext4_extent *ex, > + void *data) > +{ > + /* Just counting extents? */ > + if (fieinfo->fi_flags & FIEMAP_FLAG_NUM_EXTENTS) { > + fieinfo->fi_extents_mapped++; > + return EXT_CONTINUE; > + } This isn't needed anymore, fiemap_fill_next_extent() handles it. > +int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, > + __u64 start, __u64 len) > +{ > + /* fallback to generic here if not extents */ > +#warning fix bitmap fallback > + if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)) > + return -EOPNOTSUPP; if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)) return generic_block_fiemap(inode, fieinfo, start, len, ext4_get_block); > +#if 0 > + /* bail on unsupported flags for this fs */ > + if (fiemap_s->fm_flags & EXT4_FIEMAP_FLAG_INCOMPAT_UNSUPP) > + return -EOPNOTSUPP; > +#endif This should be reinstated now that we have come to a decision on the flags: if (fieinfo->fi_flags & ~EXT4_FIEMAP_FLAG_SUPP) { fieinfo->fi_flags &= ~EXT4_FIEMAP_FLAG_SUPP; return -EBADF; } Cheers, Andreas -- Andreas Dilger Sr. Staff Engineer, Lustre Group Sun Microsystems of Canada, Inc.