From patchwork Wed Jan 19 15:34:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 489271 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0JEuJDg010815 for ; Wed, 19 Jan 2011 17:32:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753901Ab1ASPel (ORCPT ); Wed, 19 Jan 2011 10:34:41 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:53734 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411Ab1ASPej (ORCPT ); Wed, 19 Jan 2011 10:34:39 -0500 Received: by bwz15 with SMTP id 15so906782bwz.19 for ; Wed, 19 Jan 2011 07:34:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=n1TqKJsX26j49G2aCLgvPBXyRfVGtmzq+Oc1rZH8emI=; b=cj/mgz2EpQpBTdkxLozaAFfTtWvEPffXO5JUgcynOoqydBh4hW1QMk3EW+h7vADgWW Ty+SqpXoYYL74QgP6uFd+FwKek3K6jWbnaOqsCH19PNinR4/+cefPMjnzDeNE9JT7wCI zC4h0H1bBVrFHGPO2WRSL2E/WVKC0x16sQVaI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=fy+Chz+f98gSZXg/m4Eb7SMJHIWBxzqb8J/cIFls6MiURWMt/RT35a+B/Qsgi6QSjn HfNwq/7m+uEX5bH5rWHjPXzfa/ZVVImZp4iUR8qAGWJn0lnujp5MCxpU5uJtSVgL5MaU +NIbimGjpK1kKOiqL69+lDsZ11G8C53qL8u3M= Received: by 10.204.68.9 with SMTP id t9mr760432bki.54.1295451278194; Wed, 19 Jan 2011 07:34:38 -0800 (PST) Received: from localhost ([109.110.82.162]) by mx.google.com with ESMTPS id a17sm3368669bku.11.2011.01.19.07.34.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 19 Jan 2011 07:34:37 -0800 (PST) Date: Wed, 19 Jan 2011 17:34:36 +0200 From: Ilya Dryomov To: linux-btrfs@vger.kernel.org Cc: Josef Bacik , Chris Mason , linux-kernel@vger.kernel.org Subject: [PATCH] Btrfs: remove unneeded allocation in load_free_space_cache() Message-ID: <20110119153436.GA1358@kwango.lan.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 19 Jan 2011 17:33:17 +0000 (UTC) diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 60d6842..258e45d 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -215,14 +215,14 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info, struct extent_buffer *leaf; struct page *page; struct btrfs_path *path; - u32 *checksums = NULL, *crc; + u32 *crc = NULL; char *disk_crcs = NULL; struct btrfs_key key; struct list_head bitmaps; u64 num_entries; u64 num_bitmaps; u64 generation; - u32 cur_crc = ~(u32)0; + u32 cur_crc; pgoff_t index = 0; unsigned long first_page_offset; int num_checksums; @@ -298,11 +298,8 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info, /* Setup everything for doing checksumming */ num_checksums = i_size_read(inode) / PAGE_CACHE_SIZE; - checksums = crc = kzalloc(sizeof(u32) * num_checksums, GFP_NOFS); - if (!checksums) - goto out; first_page_offset = (sizeof(u32) * num_checksums) + sizeof(u64); - disk_crcs = kzalloc(first_page_offset, GFP_NOFS); + disk_crcs = kzalloc(num_checksums, GFP_NOFS); if (!disk_crcs) goto out; @@ -352,7 +349,7 @@ int load_free_space_cache(struct btrfs_fs_info *fs_info, if (index == 0) { u64 *gen; - memcpy(disk_crcs, addr, first_page_offset); + memcpy(disk_crcs, addr, num_checksums); gen = addr + (sizeof(u32) * num_checksums); if (*gen != BTRFS_I(inode)->generation) { printk(KERN_ERR "btrfs: space cache generation" @@ -467,7 +464,6 @@ next: ret = 1; out: - kfree(checksums); kfree(disk_crcs); iput(inode); return ret;