diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /fs/isofs/rock.c | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'fs/isofs/rock.c')
| -rw-r--r-- | fs/isofs/rock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index c2fb2dd0131f..96a685c550fd 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c | |||
| @@ -518,8 +518,7 @@ repeat: | |||
| 518 | if (algo == SIG('p', 'z')) { | 518 | if (algo == SIG('p', 'z')) { |
| 519 | int block_shift = | 519 | int block_shift = |
| 520 | isonum_711(&rr->u.ZF.parms[1]); | 520 | isonum_711(&rr->u.ZF.parms[1]); |
| 521 | if (block_shift < PAGE_CACHE_SHIFT | 521 | if (block_shift > 17) { |
| 522 | || block_shift > 17) { | ||
| 523 | printk(KERN_WARNING "isofs: " | 522 | printk(KERN_WARNING "isofs: " |
| 524 | "Can't handle ZF block " | 523 | "Can't handle ZF block " |
| 525 | "size of 2^%d\n", | 524 | "size of 2^%d\n", |