diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /fs/udf/truncate.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/udf/truncate.c')
| -rw-r--r-- | fs/udf/truncate.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c index 8424308db4b4..4b98fee8e161 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c | |||
| @@ -95,23 +95,21 @@ void udf_truncate_tail_extent(struct inode *inode) | |||
| 95 | lbcount += elen; | 95 | lbcount += elen; |
| 96 | if (lbcount > inode->i_size) { | 96 | if (lbcount > inode->i_size) { |
| 97 | if (lbcount - inode->i_size >= inode->i_sb->s_blocksize) | 97 | if (lbcount - inode->i_size >= inode->i_sb->s_blocksize) |
| 98 | printk(KERN_WARNING | 98 | udf_warn(inode->i_sb, |
| 99 | "udf_truncate_tail_extent(): Too long " | 99 | "Too long extent after EOF in inode %u: i_size: %lld lbcount: %lld extent %u+%u\n", |
| 100 | "extent after EOF in inode %u: i_size: " | 100 | (unsigned)inode->i_ino, |
| 101 | "%Ld lbcount: %Ld extent %u+%u\n", | 101 | (long long)inode->i_size, |
| 102 | (unsigned)inode->i_ino, | 102 | (long long)lbcount, |
| 103 | (long long)inode->i_size, | 103 | (unsigned)eloc.logicalBlockNum, |
| 104 | (long long)lbcount, | 104 | (unsigned)elen); |
| 105 | (unsigned)eloc.logicalBlockNum, | ||
| 106 | (unsigned)elen); | ||
| 107 | nelen = elen - (lbcount - inode->i_size); | 105 | nelen = elen - (lbcount - inode->i_size); |
| 108 | epos.offset -= adsize; | 106 | epos.offset -= adsize; |
| 109 | extent_trunc(inode, &epos, &eloc, etype, elen, nelen); | 107 | extent_trunc(inode, &epos, &eloc, etype, elen, nelen); |
| 110 | epos.offset += adsize; | 108 | epos.offset += adsize; |
| 111 | if (udf_next_aext(inode, &epos, &eloc, &elen, 1) != -1) | 109 | if (udf_next_aext(inode, &epos, &eloc, &elen, 1) != -1) |
| 112 | printk(KERN_ERR "udf_truncate_tail_extent(): " | 110 | udf_err(inode->i_sb, |
| 113 | "Extent after EOF in inode %u.\n", | 111 | "Extent after EOF in inode %u\n", |
| 114 | (unsigned)inode->i_ino); | 112 | (unsigned)inode->i_ino); |
| 115 | break; | 113 | break; |
| 116 | } | 114 | } |
| 117 | } | 115 | } |