diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-21 10:31:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-21 10:31:55 -0700 |
| commit | 0939221e64687f7df9bc6572ace80ff5a90c9794 (patch) | |
| tree | 7336d5bba81539fef79c97ec1500a855861e0478 /fs/udf/inode.c | |
| parent | 7294fbd4416ab29bfb280f4f84ac78c28957c035 (diff) | |
| parent | 2b42be5eb24564227b15e66f54f088e5a26549c7 (diff) | |
| download | lwn-0939221e64687f7df9bc6572ace80ff5a90c9794.tar.gz lwn-0939221e64687f7df9bc6572ace80ff5a90c9794.zip | |
Merge tag 'fixes_for_v5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull udf fixes from Jan Kara:
"Two udf error handling fixes"
* tag 'fixes_for_v5.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Propagate errors from udf_truncate_extents()
udf: Fix crash on IO error during truncate
Diffstat (limited to 'fs/udf/inode.c')
| -rw-r--r-- | fs/udf/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index ae796e10f68b..e7276932e433 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1242,8 +1242,10 @@ set_size: truncate_setsize(inode, newsize); down_write(&iinfo->i_data_sem); udf_clear_extent_cache(inode); - udf_truncate_extents(inode); + err = udf_truncate_extents(inode); up_write(&iinfo->i_data_sem); + if (err) + return err; } update_time: inode->i_mtime = inode->i_ctime = current_time(inode); |