diff options
Diffstat (limited to 'fs/jffs2/write.c')
-rw-r--r-- | fs/jffs2/write.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index 67176792e13..c9fe0ab3a32 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c | |||
@@ -1,14 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | * JFFS2 -- Journalling Flash File System, Version 2. | 2 | * JFFS2 -- Journalling Flash File System, Version 2. |
3 | * | 3 | * |
4 | * Copyright (C) 2001-2003 Red Hat, Inc. | 4 | * Copyright © 2001-2007 Red Hat, Inc. |
5 | * | 5 | * |
6 | * Created by David Woodhouse <dwmw2@infradead.org> | 6 | * Created by David Woodhouse <dwmw2@infradead.org> |
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: write.c,v 1.97 2005/11/07 11:14:42 gleixner Exp $ | ||
11 | * | ||
12 | */ | 10 | */ |
13 | 11 | ||
14 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
@@ -507,8 +505,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, | |||
507 | uint32_t alloclen; | 505 | uint32_t alloclen; |
508 | int ret; | 506 | int ret; |
509 | 507 | ||
510 | if (1 /* alternative branch needs testing */ || | 508 | if (!jffs2_can_mark_obsolete(c)) { |
511 | !jffs2_can_mark_obsolete(c)) { | ||
512 | /* We can't mark stuff obsolete on the medium. We need to write a deletion dirent */ | 509 | /* We can't mark stuff obsolete on the medium. We need to write a deletion dirent */ |
513 | 510 | ||
514 | rd = jffs2_alloc_raw_dirent(); | 511 | rd = jffs2_alloc_raw_dirent(); |