git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
[sfrench/cifs-2.6.git]
/
fs
/
hpfs
/
file.c
diff --git
a/fs/hpfs/file.c
b/fs/hpfs/file.c
index 3027f4dbbab5195990a13d763055f229fa06213a..e4ba5fe4c3b52fad13ffcfd18fb2ad962c53c2f5 100644
(file)
--- a/
fs/hpfs/file.c
+++ b/
fs/hpfs/file.c
@@
-109,10
+109,14
@@
static void hpfs_write_failed(struct address_space *mapping, loff_t to)
{
struct inode *inode = mapping->host;
{
struct inode *inode = mapping->host;
+ hpfs_lock(inode->i_sb);
+
if (to > inode->i_size) {
truncate_pagecache(inode, to, inode->i_size);
hpfs_truncate(inode);
}
if (to > inode->i_size) {
truncate_pagecache(inode, to, inode->i_size);
hpfs_truncate(inode);
}
+
+ hpfs_unlock(inode->i_sb);
}
static int hpfs_write_begin(struct file *file, struct address_space *mapping,
}
static int hpfs_write_begin(struct file *file, struct address_space *mapping,