diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2011-09-08 10:22:01 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-10-20 18:10:43 +0200 |
| commit | 560f7d75457f86a43970aa413e334e394082dce4 (patch) | |
| tree | 19167f699de731a0c9cc1faf44035e0e958ab9fb | |
| parent | a05a9bb18ae0abec0b513b5fde876c47905fa13e (diff) | |
| download | op-kernel-dev-560f7d75457f86a43970aa413e334e394082dce4.zip op-kernel-dev-560f7d75457f86a43970aa413e334e394082dce4.tar.gz | |
Btrfs: remove BUG_ON() in compress_file_range()
It's not a big deal if we fail to allocate the array, and instead of
panic we can just give up compressing.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f12747c..81d4f68 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -393,7 +393,10 @@ again: (BTRFS_I(inode)->flags & BTRFS_INODE_COMPRESS))) { WARN_ON(pages); pages = kzalloc(sizeof(struct page *) * nr_pages, GFP_NOFS); - BUG_ON(!pages); + if (!pages) { + /* just bail out to the uncompressed code */ + goto cont; + } if (BTRFS_I(inode)->force_compress) compress_type = BTRFS_I(inode)->force_compress; @@ -424,6 +427,7 @@ again: will_compress = 1; } } +cont: if (start == 0) { trans = btrfs_join_transaction(root); BUG_ON(IS_ERR(trans)); |
