summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2014-08-01 20:13:40 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-07-16 07:22:12 +0200
commite315b460a61b7b948609bde227efd603955400a6 (patch)
treede8e03c57175adf13c83b85300db4e64528371e8 /cpukit
parentinitramfs: support initramfs that is bigger than 2GiB (diff)
downloadrtems-e315b460a61b7b948609bde227efd603955400a6.tar.bz2
kill wbuf_queued/wbuf_dwork_lock
schedule_delayed_work() happening when the work is already pending is a cheap no-op. Don't bother with ->wbuf_queued logics - it's both broken (cancelling ->wbuf_dwork leaves it set, as spotted by Jeff Harris) and pointless. It's cheaper to let schedule_delayed_work() handle that case. Reported-by: Jeff Harris <jefftharris@gmail.com> Tested-by: Jeff Harris <jefftharris@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h b/cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h
index 413ef89c2d..046fee8b6e 100644
--- a/cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h
+++ b/cpukit/libfs/src/jffs2/src/jffs2_fs_sb.h
@@ -134,8 +134,6 @@ struct jffs2_sb_info {
struct rw_semaphore wbuf_sem; /* Protects the write buffer */
struct delayed_work wbuf_dwork; /* write-buffer write-out work */
- int wbuf_queued; /* non-zero delayed work is queued */
- spinlock_t wbuf_dwork_lock; /* protects wbuf_dwork and and wbuf_queued */
unsigned char *oobbuf;
int oobavail; /* How many bytes are available for JFFS2 in OOB */