4 files changed, 19 insertions, 10 deletions

diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
index 16a5047903a6..406d9cc84ba8 100644
--- a/fs/jffs2/compr_rtime.c
+++ b/fs/jffs2/compr_rtime.c
@@ -33,7 +33,7 @@ static int jffs2_rtime_compress(unsigned char *data_in,
                                 unsigned char *cpage_out,
                                 uint32_t *sourcelen, uint32_t *dstlen)
 {
-        short positions[256];
+        unsigned short positions[256];
         int outpos = 0;
         int pos=0;
 
@@ -74,7 +74,7 @@ static int jffs2_rtime_decompress(unsigned char *data_in,
                                   unsigned char *cpage_out,
                                   uint32_t srclen, uint32_t destlen)
 {
-        short positions[256];
+        unsigned short positions[256];
         int outpos = 0;
         int pos=0;
 
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index f73991522672..601afd1afddf 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -457,12 +457,14 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r
            The umask is only applied if there's no default ACL */
         ret = jffs2_init_acl_pre(dir_i, inode, &mode);
         if (ret) {
-            make_bad_inode(inode);
-            iput(inode);
-            return ERR_PTR(ret);
+                mutex_unlock(&f->sem);
+                make_bad_inode(inode);
+                iput(inode);
+                return ERR_PTR(ret);
         }
         ret = jffs2_do_new_inode (c, f, mode, ri);
         if (ret) {
+                mutex_unlock(&f->sem);
                 make_bad_inode(inode);
                 iput(inode);
                 return ERR_PTR(ret);
@@ -479,6 +481,7 @@ struct inode *jffs2_new_inode (struct inode *dir_i, umode_t mode, struct jffs2_r
         inode->i_size = 0;
 
         if (insert_inode_locked(inode) < 0) {
+                mutex_unlock(&f->sem);
                 make_bad_inode(inode);
                 iput(inode);
                 return ERR_PTR(-EINVAL);
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h
index e4619b00f7c5..fa35ff79ab35 100644
--- a/fs/jffs2/nodelist.h
+++ b/fs/jffs2/nodelist.h
@@ -231,7 +231,7 @@ struct jffs2_tmp_dnode_info
         uint32_t version;
         uint32_t data_crc;
         uint32_t partial_crc;
-        uint16_t csize;
+        uint32_t csize;
         uint16_t overlapped;
 };
 
diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index 03310721712f..b6bd4affd9ad 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -179,6 +179,7 @@ int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize,
                                         spin_unlock(&c->erase_completion_lock);
 
                                         schedule();
+                                        remove_wait_queue(&c->erase_wait, &wait);
                                 } else
                                         spin_unlock(&c->erase_completion_lock);
                         } else if (ret)
@@ -211,20 +212,25 @@ out:
 int jffs2_reserve_space_gc(struct jffs2_sb_info *c, uint32_t minsize,
                            uint32_t *len, uint32_t sumsize)
 {
-        int ret = -EAGAIN;
+        int ret;
         minsize = PAD(minsize);
 
         jffs2_dbg(1, "%s(): Requested 0x%x bytes\n", __func__, minsize);
 
-        spin_lock(&c->erase_completion_lock);
-        while(ret == -EAGAIN) {
+        while (true) {
+                spin_lock(&c->erase_completion_lock);
                 ret = jffs2_do_reserve_space(c, minsize, len, sumsize);
                 if (ret) {
                         jffs2_dbg(1, "%s(): looping, ret is %d\n",
                                   __func__, ret);
                 }
+                spin_unlock(&c->erase_completion_lock);
+
+                if (ret == -EAGAIN)
+                        cond_resched();
+                else
+                        break;
         }
-        spin_unlock(&c->erase_completion_lock);
         if (!ret)
                 ret = jffs2_prealloc_raw_node_refs(c, c->nextblock, 1);