diff options
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/file.c | 3 | ||||
| -rw-r--r-- | fs/smbfs/inode.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/smbfs/file.c b/fs/smbfs/file.c index b4fcfa8b55..3c6eb3ba71 100644 --- a/fs/smbfs/file.c +++ b/fs/smbfs/file.c | |||
| @@ -374,8 +374,7 @@ smb_file_release(struct inode *inode, struct file * file) | |||
| 374 | /* We must flush any dirty pages now as we won't be able to | 374 | /* We must flush any dirty pages now as we won't be able to |
| 375 | write anything after close. mmap can trigger this. | 375 | write anything after close. mmap can trigger this. |
| 376 | "openers" should perhaps include mmap'ers ... */ | 376 | "openers" should perhaps include mmap'ers ... */ |
| 377 | filemap_fdatawrite(inode->i_mapping); | 377 | filemap_write_and_wait(inode->i_mapping); |
| 378 | filemap_fdatawait(inode->i_mapping); | ||
| 379 | smb_close(inode); | 378 | smb_close(inode); |
| 380 | } | 379 | } |
| 381 | unlock_kernel(); | 380 | unlock_kernel(); |
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c index 10b994428f..6ec88bf59b 100644 --- a/fs/smbfs/inode.c +++ b/fs/smbfs/inode.c | |||
| @@ -697,8 +697,7 @@ smb_notify_change(struct dentry *dentry, struct iattr *attr) | |||
| 697 | DENTRY_PATH(dentry), | 697 | DENTRY_PATH(dentry), |
| 698 | (long) inode->i_size, (long) attr->ia_size); | 698 | (long) inode->i_size, (long) attr->ia_size); |
| 699 | 699 | ||
| 700 | filemap_fdatawrite(inode->i_mapping); | 700 | filemap_write_and_wait(inode->i_mapping); |
| 701 | filemap_fdatawait(inode->i_mapping); | ||
| 702 | 701 | ||
| 703 | error = smb_open(dentry, O_WRONLY); | 702 | error = smb_open(dentry, O_WRONLY); |
| 704 | if (error) | 703 | if (error) |