← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to fs/jffs2/compr.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/jffs2/compr.c
2
2
 * JFFS2 -- Journalling Flash File System, Version 2.
3
3
 *
4
4
 * Copyright © 2001-2007 Red Hat, Inc.
5
 
 * Created by Arjan van de Ven <arjanv@redhat.com>
6
 
 *
 
5
 * Copyright © 2004-2010 David Woodhouse <dwmw2@infradead.org>
7
6
 * Copyright © 2004 Ferenc Havasi <havasi@inf.u-szeged.hu>,
8
7
 *                  University of Szeged, Hungary
9
8
 *
 
9
 * Created by Arjan van de Ven <arjan@infradead.org>
 
10
 *
10
11
 * For licensing information, see the file 'LICENCE' in this directory.
11
12
 *
12
13
 */
102
103
                        spin_unlock(&jffs2_compressor_list_lock);
103
104
                        *datalen  = orig_slen;
104
105
                        *cdatalen = orig_dlen;
105
 
                        compr_ret = this->compress(data_in, output_buf, datalen, cdatalen, NULL);
 
106
                        compr_ret = this->compress(data_in, output_buf, datalen, cdatalen);
106
107
                        spin_lock(&jffs2_compressor_list_lock);
107
108
                        this->usecount--;
108
109
                        if (!compr_ret) {
151
152
                        spin_unlock(&jffs2_compressor_list_lock);
152
153
                        *datalen  = orig_slen;
153
154
                        *cdatalen = orig_dlen;
154
 
                        compr_ret = this->compress(data_in, this->compr_buf, datalen, cdatalen, NULL);
 
155
                        compr_ret = this->compress(data_in, this->compr_buf, datalen, cdatalen);
155
156
                        spin_lock(&jffs2_compressor_list_lock);
156
157
                        this->usecount--;
157
158
                        if (!compr_ret) {
177
178
                spin_unlock(&jffs2_compressor_list_lock);
178
179
                break;
179
180
        default:
180
 
                printk(KERN_ERR "JFFS2: unknow compression mode.\n");
 
181
                printk(KERN_ERR "JFFS2: unknown compression mode.\n");
181
182
        }
182
183
 out:
183
184
        if (ret == JFFS2_COMPR_NONE) {
219
220
                        if (comprtype == this->compr) {
220
221
                                this->usecount++;
221
222
                                spin_unlock(&jffs2_compressor_list_lock);
222
 
                                ret = this->decompress(cdata_in, data_out, cdatalen, datalen, NULL);
 
223
                                ret = this->decompress(cdata_in, data_out, cdatalen, datalen);
223
224
                                spin_lock(&jffs2_compressor_list_lock);
224
225
                                if (ret) {
225
226
                                        printk(KERN_WARNING "Decompressor \"%s\" returned %d\n", this->name, ret);