projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[cascardo/linux.git]
/
fs
/
ubifs
/
file.c
diff --git
a/fs/ubifs/file.c
b/fs/ubifs/file.c
index
4f34dba
..
0ab7f7d
100644
(file)
--- a/
fs/ubifs/file.c
+++ b/
fs/ubifs/file.c
@@
-903,8
+903,9
@@
static int do_writepage(struct page *page, int len)
struct ubifs_info *c = inode->i_sb->s_fs_info;
#ifdef UBIFS_DEBUG
struct ubifs_info *c = inode->i_sb->s_fs_info;
#ifdef UBIFS_DEBUG
+ struct ubifs_inode *ui = ubifs_inode(inode);
spin_lock(&ui->ui_lock);
spin_lock(&ui->ui_lock);
- ubifs_assert(page->index <= ui->synced_i_size
<< PAGE_CACHE_SIZE
);
+ ubifs_assert(page->index <= ui->synced_i_size
>> PAGE_CACHE_SHIFT
);
spin_unlock(&ui->ui_lock);
#endif
spin_unlock(&ui->ui_lock);
#endif
@@
-1525,8
+1526,7
@@
static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma,
}
wait_for_stable_page(page);
}
wait_for_stable_page(page);
- unlock_page(page);
- return 0;
+ return VM_FAULT_LOCKED;
out_unlock:
unlock_page(page);
out_unlock:
unlock_page(page);