diff options
| author | Yan <yanzheng@21cn.com> | 2008-02-05 15:40:36 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:00 -0400 |
| commit | 7261009ceaee65e4683be6e474d1ea85a1b1b26c (patch) | |
| tree | fb06ec79b70c2528921725d95df056d1065eacc8 /fs | |
| parent | 068fe39fa18e8921062e2e16e6aa2b46768b2a35 (diff) | |
| download | op-kernel-dev-7261009ceaee65e4683be6e474d1ea85a1b1b26c.zip op-kernel-dev-7261009ceaee65e4683be6e474d1ea85a1b1b26c.tar.gz | |
btrfs_drop_extents: handle BTRFS_INODE_REF_KEY types
It's possible "key.type == BTRFS_INODE_REF_KEY" and "key.offset >= end".
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 184bde1..bfa4149 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -507,11 +507,12 @@ next_slot: slot = path->slots[0]; ret = 0; btrfs_item_key_to_cpu(leaf, &key, slot); - - if (key.offset >= end || key.objectid != inode->i_ino) { + if (btrfs_key_type(&key) == BTRFS_EXTENT_DATA_KEY && + key.offset >= end) { goto out; } - if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY) { + if (btrfs_key_type(&key) > BTRFS_EXTENT_DATA_KEY || + key.objectid != inode->i_ino) { goto out; } if (recow) { |
