From patchwork Tue Jun 7 15:07:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Amir G." X-Patchwork-Id: 99235 X-Patchwork-Delegate: tytso@mit.edu Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45691B6F91 for ; Wed, 8 Jun 2011 01:09:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756561Ab1FGPJb (ORCPT ); Tue, 7 Jun 2011 11:09:31 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:41767 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756262Ab1FGPJb (ORCPT ); Tue, 7 Jun 2011 11:09:31 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so5035787wwa.1 for ; Tue, 07 Jun 2011 08:09:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=vvcjA+VcP0scikqskuVjFNUwSwp49g2SiwgaQXWpmuI=; b=emHql1Vham3FxRgtgsVtsUBhtGErSXLTd6anpqCYUEljTdletPh7Bz4UWpyNlaOoud /v/59keY11iAI4oyi/XfeOvYRrfDfk4ab/fb7s3X4/qOfZvxhBoRiCIzzospieSe8MlP Plj/DLTPorTaqCXNd78/FqWSXux+4ZyB3eDNU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=bBaZSzXO2x3FXD56liftukuNdglLkNawHJyHB1Ng5AERQeVAy7iVS46EsbcP6KcNP8 aK0jvyJYq3pw8GEMBieTgI+qrINhNbd3nSU9gjO5hSqGbMrxQNvQqYTH4U5kVMCHB4dT wwjYJ7uMdGIqkF2l0OSnKLdAwCjf7ZXSZekLI= Received: by 10.227.128.138 with SMTP id k10mr6267687wbs.82.1307459370570; Tue, 07 Jun 2011 08:09:30 -0700 (PDT) Received: from localhost.localdomain (bzq-218-153-66.cablep.bezeqint.net [81.218.153.66]) by mx.google.com with ESMTPS id en1sm3622645wbb.52.2011.06.07.08.09.27 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Jun 2011 08:09:30 -0700 (PDT) From: amir73il@users.sourceforge.net To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, lczerner@redhat.com, Amir Goldstein , Yongqiang Yang Subject: [PATCH v1 13/36] ext4: snapshot file - increase maximum file size limit to 16TB Date: Tue, 7 Jun 2011 18:07:40 +0300 Message-Id: <1307459283-22130-14-git-send-email-amir73il@users.sourceforge.net> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307459283-22130-1-git-send-email-amir73il@users.sourceforge.net> References: <1307459283-22130-1-git-send-email-amir73il@users.sourceforge.net> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Amir Goldstein Files larger than 2TB use Ext4 huge_file flag to store i_blocks in file system blocks units, so the upper limit on snapshot actual size is increased from 512*2^32 = 2TB to 4K*2^32 = 16TB, which is also the upper limit on file system size. To map 2^32 logical blocks, 4 triple indirect blocks are used instead of just one. The extra 3 triple indirect blocks are stored in-place of direct blocks, which are not in use by snapshot files. Signed-off-by: Amir Goldstein Signed-off-by: Yongqiang Yang --- fs/ext4/ext4.h | 13 +++++++++++++ fs/ext4/file.c | 3 ++- fs/ext4/inode.c | 43 +++++++++++++++++++++++++++++++++++++++++-- fs/ext4/super.c | 3 +++ 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 7f96ba5..81e6add 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -320,6 +320,19 @@ struct flex_groups { #define EXT4_DIND_BLOCK (EXT4_IND_BLOCK + 1) #define EXT4_TIND_BLOCK (EXT4_DIND_BLOCK + 1) #define EXT4_N_BLOCKS (EXT4_TIND_BLOCK + 1) +/* + * Snapshot files have different indirection mapping that can map up to 2^32 + * logical blocks, so they can cover the mapped filesystem block address space. + * Ext4 must use either 4K or 8K blocks (depending on PAGE_SIZE). + * With 8K blocks, 1 triple indirect block maps 2^33 logical blocks. + * With 4K blocks (the system default), each triple indirect block maps 2^30 + * logical blocks, so 4 triple indirect blocks map 2^32 logical blocks. + * Snapshot files in small filesystems (<= 4G), use only 1 double indirect + * block to map the entire filesystem. + */ +#define EXT4_SNAPSHOT_EXTRA_TIND_BLOCKS 3 +#define EXT4_SNAPSHOT_N_BLOCKS (EXT4_TIND_BLOCK + 1 + \ + EXT4_SNAPSHOT_EXTRA_TIND_BLOCKS) /* * Inode flags diff --git a/fs/ext4/file.c b/fs/ext4/file.c index f31e58e..0ebd3e7 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -228,7 +228,8 @@ loff_t ext4_llseek(struct file *file, loff_t offset, int origin) struct inode *inode = file->f_mapping->host; loff_t maxbytes; - if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) + if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) && + !ext4_snapshot_file(inode)) maxbytes = EXT4_SB(inode->i_sb)->s_bitmap_maxbytes; else maxbytes = inode->i_sb->s_maxbytes; diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 33692fd..e64cf64 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -335,6 +335,7 @@ static int ext4_block_to_path(struct inode *inode, double_blocks = (1 << (ptrs_bits * 2)); int n = 0; int final = 0; + int tind; if (i_block < direct_blocks) { offsets[n++] = i_block; @@ -354,6 +355,18 @@ static int ext4_block_to_path(struct inode *inode, offsets[n++] = (i_block >> ptrs_bits) & (ptrs - 1); offsets[n++] = i_block & (ptrs - 1); final = ptrs; + } else if (ext4_snapshot_file(inode) && + (i_block >> (ptrs_bits * 3)) < + EXT4_SNAPSHOT_EXTRA_TIND_BLOCKS + 1) { + tind = i_block >> (ptrs_bits * 3); + BUG_ON(tind == 0); + /* use up to 4 triple indirect blocks to map 2^32 blocks */ + i_block -= (tind << (ptrs_bits * 3)); + offsets[n++] = (EXT4_TIND_BLOCK + tind) % EXT4_NDIR_BLOCKS; + offsets[n++] = i_block >> (ptrs_bits * 2); + offsets[n++] = (i_block >> ptrs_bits) & (ptrs - 1); + offsets[n++] = i_block & (ptrs - 1); + final = ptrs; } else { ext4_warning(inode->i_sb, "block %lu > max in inode %lu", i_block + direct_blocks + @@ -4841,6 +4854,10 @@ do_indirects: /* Kill the remaining (whole) subtrees */ switch (offsets[0]) { default: + if (ext4_snapshot_file(inode) && + offsets[0] < EXT4_SNAPSHOT_EXTRA_TIND_BLOCKS) + /* Freeing snapshot extra tind branches */ + break; nr = i_data[EXT4_IND_BLOCK]; if (nr) { ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 1); @@ -4862,6 +4879,19 @@ do_indirects: ; } + if (ext4_snapshot_file(inode)) { + int i; + + /* Kill the remaining snapshot file triple indirect trees */ + for (i = 0; i < EXT4_SNAPSHOT_EXTRA_TIND_BLOCKS; i++) { + nr = i_data[i]; + if (!nr) + continue; + ext4_free_branches(handle, inode, NULL, &nr, &nr+1, 3); + i_data[i] = 0; + } + } + out_unlock: up_write(&ei->i_data_sem); inode->i_mtime = inode->i_ctime = ext4_current_time(inode); @@ -5096,7 +5126,8 @@ static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode, struct super_block *sb = inode->i_sb; if (EXT4_HAS_RO_COMPAT_FEATURE(sb, - EXT4_FEATURE_RO_COMPAT_HUGE_FILE)) { + EXT4_FEATURE_RO_COMPAT_HUGE_FILE) || + ext4_snapshot_file(inode)) { /* we are using combined 48 bit field */ i_blocks = ((u64)le16_to_cpu(raw_inode->i_blocks_high)) << 32 | le32_to_cpu(raw_inode->i_blocks_lo); @@ -5335,7 +5366,9 @@ static int ext4_inode_blocks_set(handle_t *handle, ext4_clear_inode_flag(inode, EXT4_INODE_HUGE_FILE); return 0; } - if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_HUGE_FILE)) + /* snapshot files may be represented as huge files */ + if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_HUGE_FILE) && + !ext4_snapshot_file(inode)) return -EFBIG; if (i_blocks <= 0xffffffffffffULL) { @@ -5625,6 +5658,12 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) } if (attr->ia_valid & ATTR_SIZE) { + /* prevent size modification of snapshot files */ + if (ext4_snapshot_file(inode) && attr->ia_size != 0) { + snapshot_debug(1, "snapshot file (%lu) can only be " + "truncated to 0!\n", inode->i_ino); + return -EPERM; + } if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) { struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 7655010..dbe5651 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3302,6 +3302,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) EXT4_FEATURE_RO_COMPAT_HUGE_FILE); sbi->s_bitmap_maxbytes = ext4_max_bitmap_size(sb->s_blocksize_bits, has_huge_files); + if (EXT4_SNAPSHOTS(sb)) + /* Snapshot files are huge files */ + has_huge_files = 1; sb->s_maxbytes = ext4_max_size(sb->s_blocksize_bits, has_huge_files); if (le32_to_cpu(es->s_rev_level) == EXT4_GOOD_OLD_REV) {