Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4472
b: refs/heads/master
c: 8aee6ac
h: refs/heads/master
v: v3
  • Loading branch information
David Woodhouse authored and Thomas Gleixner committed May 23, 2005
1 parent 8dd3392 commit 298f1d8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f29a4b86f554a496beba8d339917399b9c44fbc9
refs/heads/master: 8aee6ac1446d6e2cb69908facbaccc0dfb4f1145
8 changes: 7 additions & 1 deletion trunk/fs/jffs2/wbuf.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: wbuf.c,v 1.84 2005/01/25 20:11:11 hammache Exp $
* $Id: wbuf.c,v 1.85 2005/02/02 22:12:04 dwmw2 Exp $
*
*/

Expand Down Expand Up @@ -534,6 +534,9 @@ int jffs2_flush_wbuf_gc(struct jffs2_sb_info *c, uint32_t ino)

D1(printk(KERN_DEBUG "jffs2_flush_wbuf_gc() called for ino #%u...\n", ino));

if (!c->wbuf)
return 0;

down(&c->alloc_sem);
if (!jffs2_wbuf_pending_for_ino(c, ino)) {
D1(printk(KERN_DEBUG "Ino #%d not pending in wbuf. Returning\n", ino));
Expand Down Expand Up @@ -588,6 +591,9 @@ int jffs2_flush_wbuf_pad(struct jffs2_sb_info *c)
{
int ret;

if (!c->wbuf)
return 0;

down_write(&c->wbuf_sem);
ret = __jffs2_flush_wbuf(c, PAD_NOACCOUNT);
/* retry - maybe wbuf recover left some data in wbuf. */
Expand Down

0 comments on commit 298f1d8

Please sign in to comment.