summaryrefslogtreecommitdiff
path: root/fs/jffs2/jffs2_fs_sb.h
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2014-08-01 23:13:40 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-10-09 10:39:01 +0400
commit99358a1ca53e8e6ce09423500191396f0e6584d2 (patch)
treece3dca2597219e4e0cd7fe4e308e634c86613263 /fs/jffs2/jffs2_fs_sb.h
parent4e07ad6406d8137cc5aa1317568408c461ee8ce8 (diff)
downloadlinux-99358a1ca53e8e6ce09423500191396f0e6584d2.tar.xz
[jffs2] 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 'fs/jffs2/jffs2_fs_sb.h')
-rw-r--r--fs/jffs2/jffs2_fs_sb.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/jffs2/jffs2_fs_sb.h b/fs/jffs2/jffs2_fs_sb.h
index 413ef89c2d1b..046fee8b6e9b 100644
--- a/fs/jffs2/jffs2_fs_sb.h
+++ b/fs/jffs2/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 */