6 files changed, 42 insertions, 40 deletions

diff --git a/fs/jffs2/acl.c b/fs/jffs2/acl.c
index 77fc5838609c..4c80404a9aba 100644
--- a/fs/jffs2/acl.c
+++ b/fs/jffs2/acl.c
@@ -176,7 +176,7 @@ static void jffs2_iset_acl(struct inode *inode, struct posix_acl **i_acl, struct
         spin_unlock(&inode->i_lock);
 }
 
-struct posix_acl *jffs2_get_acl(struct inode *inode, int type)
+static struct posix_acl *jffs2_get_acl(struct inode *inode, int type)
 {
         struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
         struct posix_acl *acl;
@@ -345,8 +345,10 @@ int jffs2_init_acl_pre(struct inode *dir_i, struct inode *inode, int *i_mode)
                 if (!clone)
                         return -ENOMEM;
                 rc = posix_acl_create_masq(clone, (mode_t *)i_mode);
-                if (rc < 0)
+                if (rc < 0) {
+                        posix_acl_release(clone);
                         return rc;
+                }
                 if (rc > 0)
                         jffs2_iset_acl(inode, &f->i_acl_access, clone);
 
diff --git a/fs/jffs2/acl.h b/fs/jffs2/acl.h
index 76c6ebd1acd9..0bb7f003fd80 100644
--- a/fs/jffs2/acl.h
+++ b/fs/jffs2/acl.h
@@ -28,7 +28,6 @@ struct jffs2_acl_header {
 
 #define JFFS2_ACL_NOT_CACHED ((void *)-1)
 
-extern struct posix_acl *jffs2_get_acl(struct inode *inode, int type);
 extern int jffs2_permission(struct inode *, int, struct nameidata *);
 extern int jffs2_acl_chmod(struct inode *);
 extern int jffs2_init_acl_pre(struct inode *, struct inode *, int *);
@@ -40,7 +39,6 @@ extern struct xattr_handler jffs2_acl_default_xattr_handler;
 
 #else
 
-#define jffs2_get_acl(inode, type)              (NULL)
 #define jffs2_permission                        (NULL)
 #define jffs2_acl_chmod(inode)                  (0)
 #define jffs2_init_acl_pre(dir_i,inode,mode)    (0)
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 6d1eaddde0ec..e26ea78c7892 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -97,11 +97,7 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
         ri->gid = cpu_to_je16((ivalid & ATTR_GID)?iattr->ia_gid:inode->i_gid);
 
         if (ivalid & ATTR_MODE)
-                if (iattr->ia_mode & S_ISGID &&
-                    !in_group_p(je16_to_cpu(ri->gid)) && !capable(CAP_FSETID))
-                        ri->mode = cpu_to_jemode(iattr->ia_mode & ~S_ISGID);
-                else
-                        ri->mode = cpu_to_jemode(iattr->ia_mode);
+                ri->mode = cpu_to_jemode(iattr->ia_mode);
         else
                 ri->mode = cpu_to_jemode(inode->i_mode);
 
diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index 4bf86088b3ae..87c6f555e1a0 100644
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -32,15 +32,18 @@ void jffs2_add_fd_to_list(struct jffs2_sb_info *c, struct jffs2_full_dirent *new
                 if ((*prev)->nhash == new->nhash && !strcmp((*prev)->name, new->name)) {
                         /* Duplicate. Free one */
                         if (new->version < (*prev)->version) {
-                                dbg_dentlist("Eep! Marking new dirent node is obsolete, old is \"%s\", ino #%u\n",
+                                dbg_dentlist("Eep! Marking new dirent node obsolete, old is \"%s\", ino #%u\n",
                                         (*prev)->name, (*prev)->ino);
                                 jffs2_mark_node_obsolete(c, new->raw);
                                 jffs2_free_full_dirent(new);
                         } else {
-                                dbg_dentlist("marking old dirent \"%s\", ino #%u bsolete\n",
+                                dbg_dentlist("marking old dirent \"%s\", ino #%u obsolete\n",
                                         (*prev)->name, (*prev)->ino);
                                 new->next = (*prev)->next;
-                                jffs2_mark_node_obsolete(c, ((*prev)->raw));
+                                /* It may have been a 'placeholder' deletion dirent, 
+                                   if jffs2_can_mark_obsolete() (see jffs2_do_unlink()) */
+                                if ((*prev)->raw)
+                                        jffs2_mark_node_obsolete(c, ((*prev)->raw));
                                 jffs2_free_full_dirent(*prev);
                                 *prev = new;
                         }
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 6c1ba3566f58..e512a93d6249 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -37,23 +37,24 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
 
         BUG_ON(tn->csize == 0);
 
-        if (!jffs2_is_writebuffered(c))
-                goto adj_acc;
-
         /* Calculate how many bytes were already checked */
         ofs = ref_offset(ref) + sizeof(struct jffs2_raw_inode);
-        len = ofs % c->wbuf_pagesize;
-        if (likely(len))
-                len = c->wbuf_pagesize - len;
-
-        if (len >= tn->csize) {
-                dbg_readinode("no need to check node at %#08x, data length %u, data starts at %#08x - it has already been checked.\n",
-                        ref_offset(ref), tn->csize, ofs);
-                goto adj_acc;
-        }
+        len = tn->csize;
+
+        if (jffs2_is_writebuffered(c)) {
+                int adj = ofs % c->wbuf_pagesize;
+                if (likely(adj))
+                        adj = c->wbuf_pagesize - adj;
+
+                if (adj >= tn->csize) {
+                        dbg_readinode("no need to check node at %#08x, data length %u, data starts at %#08x - it has already been checked.\n",
+                                      ref_offset(ref), tn->csize, ofs);
+                        goto adj_acc;
+                }
 
-        ofs += len;
-        len = tn->csize - len;
+                ofs += adj;
+                len -= adj;
+        }
 
         dbg_readinode("check node at %#08x, data length %u, partial CRC %#08x, correct CRC %#08x, data starts at %#08x, start checking from %#08x - %u bytes.\n",
                 ref_offset(ref), tn->csize, tn->partial_crc, tn->data_crc, ofs - len, ofs, len);
@@ -63,7 +64,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
          * adding and jffs2_flash_read_end() interface. */
         if (c->mtd->point) {
                 err = c->mtd->point(c->mtd, ofs, len, &retlen, &buffer);
-                if (!err && retlen < tn->csize) {
+                if (!err && retlen < len) {
                         JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize);
                         c->mtd->unpoint(c->mtd, buffer, ofs, retlen);
                 } else if (err)
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c
index 1b88e6e734ef..776f13cbf2b5 100644
--- a/fs/jffs2/write.c
+++ b/fs/jffs2/write.c
@@ -582,7 +582,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
                 jffs2_add_fd_to_list(c, fd, &dir_f->dents);
                 up(&dir_f->sem);
         } else {
-                struct jffs2_full_dirent **prev = &dir_f->dents;
+                struct jffs2_full_dirent *fd = dir_f->dents;
                 uint32_t nhash = full_name_hash(name, namelen);
 
                 /* We don't actually want to reserve any space, but we do
@@ -590,21 +590,22 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
                 down(&c->alloc_sem);
                 down(&dir_f->sem);
 
-                while ((*prev) && (*prev)->nhash <= nhash) {
-                        if ((*prev)->nhash == nhash &&
-                            !memcmp((*prev)->name, name, namelen) &&
-                            !(*prev)->name[namelen]) {
-                                struct jffs2_full_dirent *this = *prev;
+                for (fd = dir_f->dents; fd; fd = fd->next) {
+                        if (fd->nhash == nhash &&
+                            !memcmp(fd->name, name, namelen) &&
+                            !fd->name[namelen]) {
 
                                 D1(printk(KERN_DEBUG "Marking old dirent node (ino #%u) @%08x obsolete\n",
-                                          this->ino, ref_offset(this->raw)));
-
-                                *prev = this->next;
-                                jffs2_mark_node_obsolete(c, (this->raw));
-                                jffs2_free_full_dirent(this);
+                                          fd->ino, ref_offset(fd->raw)));
+                                jffs2_mark_node_obsolete(c, fd->raw);
+                                /* We don't want to remove it from the list immediately,
+                                   because that screws up getdents()/seek() semantics even
+                                   more than they're screwed already. Turn it into a
+                                   node-less deletion dirent instead -- a placeholder */
+                                fd->raw = NULL;
+                                fd->ino = 0;
                                 break;
                         }
-                        prev = &((*prev)->next);
                 }
                 up(&dir_f->sem);
         }
@@ -630,7 +631,8 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
                                         D1(printk(KERN_DEBUG "Removing deletion dirent for \"%s\" from dir ino #%u\n",
                                                 fd->name, dead_f->inocache->ino));
                                 }
-                                jffs2_mark_node_obsolete(c, fd->raw);
+                                if (fd->raw)
+                                        jffs2_mark_node_obsolete(c, fd->raw);
                                 jffs2_free_full_dirent(fd);
                         }
                 }