diff options
| author | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /fs/jffs2/file.c | |
| parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'fs/jffs2/file.c')
| -rw-r--r-- | fs/jffs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 5edc2bf20581..23c947539864 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c | |||
| @@ -99,7 +99,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg) | |||
| 99 | kunmap(pg); | 99 | kunmap(pg); |
| 100 | 100 | ||
| 101 | D2(printk(KERN_DEBUG "readpage finished\n")); | 101 | D2(printk(KERN_DEBUG "readpage finished\n")); |
| 102 | return 0; | 102 | return ret; |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | int jffs2_do_readpage_unlock(struct inode *inode, struct page *pg) | 105 | int jffs2_do_readpage_unlock(struct inode *inode, struct page *pg) |