Merge branch 'akpm' (Andrew's patch-bomb)

Merge the rest of Andrew's patches for -rc1:
 "A bunch of fixes and misc missed-out-on things.

  That'll do for -rc1.  I still have a batch of IPC patches which still
  have a possible bug report which I'm chasing down."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (25 commits)
  keys: use keyring_alloc() to create module signing keyring
  keys: fix unreachable code
  sendfile: allows bypassing of notifier events
  SGI-XP: handle non-fatal traps
  fat: fix incorrect function comment
  Documentation: ABI: remove testing/sysfs-devices-node
  proc: fix inconsistent lock state
  linux/kernel.h: fix DIV_ROUND_CLOSEST with unsigned divisors
  memcg: don't register hotcpu notifier from ->css_alloc()
  checkpatch: warn on uapi #includes that #include <uapi/...
  revert "rtc: recycle id when unloading a rtc driver"
  mm: clean up transparent hugepage sysfs error messages
  hfsplus: add error message for the case of failure of sync fs in delayed_sync_fs() method
  hfsplus: rework processing of hfs_btree_write() returned error
  hfsplus: rework processing errors in hfsplus_free_extents()
  hfsplus: avoid crash on failed block map free
  kcmp: include linux/ptrace.h
  drivers/rtc/rtc-imxdi.c: must include <linux/spinlock.h>
  mm: cma: WARN if freed memory is still in use
  exec: do not leave bprm->interp on stack
  ...

13 files changed, 85 insertions, 23 deletions

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 9be335fb8a7..0c8869fdd14 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -172,7 +172,10 @@ static int load_misc_binary(struct linux_binprm *bprm)
                 goto _error;
         bprm->argc ++;
 
-        bprm->interp = iname;   /* for binfmt_script */
+        /* Update interp in case binfmt_script needs it. */
+        retval = bprm_change_interp(iname, bprm);
+        if (retval < 0)
+                goto _error;
 
         interp_file = open_exec (iname);
         retval = PTR_ERR (interp_file);
diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index 1610a91637e..5027a3e1492 100644
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -80,7 +80,9 @@ static int load_script(struct linux_binprm *bprm)
         retval = copy_strings_kernel(1, &i_name, bprm);
         if (retval) return retval; 
         bprm->argc++;
-        bprm->interp = interp;
+        retval = bprm_change_interp(interp, bprm);
+        if (retval < 0)
+                return retval;
 
         /*
          * OK, now restart the process with the interpreter's dentry.
diff --git a/fs/exec.c b/fs/exec.c
index af8ec80f816..18c45cac368 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1175,9 +1175,24 @@ void free_bprm(struct linux_binprm *bprm)
                 mutex_unlock(&current->signal->cred_guard_mutex);
                 abort_creds(bprm->cred);
         }
+        /* If a binfmt changed the interp, free it. */
+        if (bprm->interp != bprm->filename)
+                kfree(bprm->interp);
         kfree(bprm);
 }
 
+int bprm_change_interp(char *interp, struct linux_binprm *bprm)
+{
+        /* If a binfmt changed the interp, free it first. */
+        if (bprm->interp != bprm->filename)
+                kfree(bprm->interp);
+        bprm->interp = kstrdup(interp, GFP_KERNEL);
+        if (!bprm->interp)
+                return -ENOMEM;
+        return 0;
+}
+EXPORT_SYMBOL(bprm_change_interp);
+
 /*
  * install the new credentials for this executable
  */
diff --git a/fs/fat/dir.c b/fs/fat/dir.c
index 2a182342442..58bf744dbf3 100644
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@ -461,8 +461,7 @@ static int fat_parse_short(struct super_block *sb,
 }
 
 /*
- * Return values: negative -> error, 0 -> not found, positive -> found,
- * value is the total amount of slots, including the shortname entry.
+ * Return values: negative -> error/not found, 0 -> found.
  */
 int fat_search_long(struct inode *inode, const unsigned char *name,
                     int name_len, struct fat_slot_info *sinfo)
@@ -1255,7 +1254,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
 
         sinfo->nr_slots = nr_slots;
 
-        /* First stage: search free direcotry entries */
+        /* First stage: search free directory entries */
         free_slots = nr_bhs = 0;
         bh = prev = NULL;
         pos = 0;
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 35806813ea4..f8f491677a4 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1344,7 +1344,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
         sbi->dir_entries = get_unaligned_le16(&b->dir_entries);
         if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
                 if (!silent)
-                        fat_msg(sb, KERN_ERR, "bogus directroy-entries per block"
+                        fat_msg(sb, KERN_ERR, "bogus directory-entries per block"
                                " (%u)", sbi->dir_entries);
                 brelse(bh);
                 goto out_invalid;
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 5eb600dc43a..359d307b550 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -135,6 +135,10 @@ int fat_chain_add(struct inode *inode, int new_dclus, int nr_cluster)
                 }
                 if (ret < 0)
                         return ret;
+                /*
+                 * FIXME:Although we can add this cache, fat_cache_add() is
+                 * assuming to be called after linear search with fat_cache_id.
+                 */
 //              fat_cache_add(inode, new_fclus, new_dclus);
         } else {
                 MSDOS_I(inode)->i_start = new_dclus;
diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c
index 4cfbe2edd29..6feefc0cb48 100644
--- a/fs/hfsplus/bitmap.c
+++ b/fs/hfsplus/bitmap.c
@@ -176,12 +176,14 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
         dprint(DBG_BITMAP, "block_free: %u,%u\n", offset, count);
         /* are all of the bits in range? */
         if ((offset + count) > sbi->total_blocks)
-                return -2;
+                return -ENOENT;
 
         mutex_lock(&sbi->alloc_mutex);
         mapping = sbi->alloc_file->i_mapping;
         pnr = offset / PAGE_CACHE_BITS;
         page = read_mapping_page(mapping, pnr, NULL);
+        if (IS_ERR(page))
+                goto kaboom;
         pptr = kmap(page);
         curr = pptr + (offset & (PAGE_CACHE_BITS - 1)) / 32;
         end = pptr + PAGE_CACHE_BITS / 32;
@@ -214,6 +216,8 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
                 set_page_dirty(page);
                 kunmap(page);
                 page = read_mapping_page(mapping, ++pnr, NULL);
+                if (IS_ERR(page))
+                        goto kaboom;
                 pptr = kmap(page);
                 curr = pptr;
                 end = pptr + PAGE_CACHE_BITS / 32;
@@ -232,4 +236,11 @@ out:
         mutex_unlock(&sbi->alloc_mutex);
 
         return 0;
+
+kaboom:
+        printk(KERN_CRIT "hfsplus: unable to mark blocks free: error %ld\n",
+                        PTR_ERR(page));
+        mutex_unlock(&sbi->alloc_mutex);
+
+        return -EIO;
 }
diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
index 21023d9f8ff..685d07d0ed1 100644
--- a/fs/hfsplus/btree.c
+++ b/fs/hfsplus/btree.c
@@ -159,7 +159,7 @@ void hfs_btree_close(struct hfs_btree *tree)
         kfree(tree);
 }
 
-void hfs_btree_write(struct hfs_btree *tree)
+int hfs_btree_write(struct hfs_btree *tree)
 {
         struct hfs_btree_header_rec *head;
         struct hfs_bnode *node;
@@ -168,7 +168,7 @@ void hfs_btree_write(struct hfs_btree *tree)
         node = hfs_bnode_find(tree, 0);
         if (IS_ERR(node))
                 /* panic? */
-                return;
+                return -EIO;
         /* Load the header */
         page = node->page[0];
         head = (struct hfs_btree_header_rec *)(kmap(page) +
@@ -186,6 +186,7 @@ void hfs_btree_write(struct hfs_btree *tree)
         kunmap(page);
         set_page_dirty(page);
         hfs_bnode_put(node);
+        return 0;
 }
 
 static struct hfs_bnode *hfs_bmap_new_bmap(struct hfs_bnode *prev, u32 idx)
diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c
index 5849e3ef35c..eba76eab6d6 100644
--- a/fs/hfsplus/extents.c
+++ b/fs/hfsplus/extents.c
@@ -329,6 +329,7 @@ static int hfsplus_free_extents(struct super_block *sb,
 {
         u32 count, start;
         int i;
+        int err = 0;
 
         hfsplus_dump_extent(extent);
         for (i = 0; i < 8; extent++, i++) {
@@ -345,18 +346,33 @@ found:
         for (;;) {
                 start = be32_to_cpu(extent->start_block);
                 if (count <= block_nr) {
-                        hfsplus_block_free(sb, start, count);
+                        err = hfsplus_block_free(sb, start, count);
+                        if (err) {
+                                printk(KERN_ERR "hfs: can't free extent\n");
+                                dprint(DBG_EXTENT, " start: %u count: %u\n",
+                                        start, count);
+                        }
                         extent->block_count = 0;
                         extent->start_block = 0;
                         block_nr -= count;
                 } else {
                         count -= block_nr;
-                        hfsplus_block_free(sb, start + count, block_nr);
+                        err = hfsplus_block_free(sb, start + count, block_nr);
+                        if (err) {
+                                printk(KERN_ERR "hfs: can't free extent\n");
+                                dprint(DBG_EXTENT, " start: %u count: %u\n",
+                                        start, count);
+                        }
                         extent->block_count = cpu_to_be32(count);
                         block_nr = 0;
                 }
-                if (!block_nr || !i)
-                        return 0;
+                if (!block_nr || !i) {
+                        /*
+                         * Try to free all extents and
+                         * return only last error
+                         */
+                        return err;
+                }
                 i--;
                 extent--;
                 count = be32_to_cpu(extent->block_count);
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
index c571de224b1..a6da86b1b4c 100644
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@ -335,7 +335,7 @@ int hfsplus_block_free(struct super_block *, u32, u32);
 /* btree.c */
 struct hfs_btree *hfs_btree_open(struct super_block *, u32);
 void hfs_btree_close(struct hfs_btree *);
-void hfs_btree_write(struct hfs_btree *);
+int hfs_btree_write(struct hfs_btree *);
 struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *);
 void hfs_bmap_free(struct hfs_bnode *);
 
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
index 811a84d2d96..796198d2655 100644
--- a/fs/hfsplus/super.c
+++ b/fs/hfsplus/super.c
@@ -127,8 +127,14 @@ static int hfsplus_system_write_inode(struct inode *inode)
                 hfsplus_mark_mdb_dirty(inode->i_sb);
         }
         hfsplus_inode_write_fork(inode, fork);
-        if (tree)
-                hfs_btree_write(tree);
+        if (tree) {
+                int err = hfs_btree_write(tree);
+                if (err) {
+                        printk(KERN_ERR "hfs: b-tree write err: %d, ino %lu\n",
+                                        err, inode->i_ino);
+                        return err;
+                }
+        }
         return 0;
 }
 
@@ -226,6 +232,7 @@ out:
 
 static void delayed_sync_fs(struct work_struct *work)
 {
+        int err;
         struct hfsplus_sb_info *sbi;
 
         sbi = container_of(work, struct hfsplus_sb_info, sync_work.work);
@@ -234,7 +241,9 @@ static void delayed_sync_fs(struct work_struct *work)
         sbi->work_queued = 0;
         spin_unlock(&sbi->work_lock);
 
-        hfsplus_sync_fs(sbi->alloc_file->i_sb, 1);
+        err = hfsplus_sync_fs(sbi->alloc_file->i_sb, 1);
+        if (err)
+                printk(KERN_ERR "hfs: delayed sync fs err %d\n", err);
 }
 
 void hfsplus_mark_mdb_dirty(struct super_block *sb)
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 2e4ed13b9ee..e064f562b1f 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -352,18 +352,18 @@ retry:
         if (!ida_pre_get(&proc_inum_ida, GFP_KERNEL))
                 return -ENOMEM;
 
-        spin_lock(&proc_inum_lock);
+        spin_lock_bh(&proc_inum_lock);
         error = ida_get_new(&proc_inum_ida, &i);
-        spin_unlock(&proc_inum_lock);
+        spin_unlock_bh(&proc_inum_lock);
         if (error == -EAGAIN)
                 goto retry;
         else if (error)
                 return error;
 
         if (i > UINT_MAX - PROC_DYNAMIC_FIRST) {
-                spin_lock(&proc_inum_lock);
+                spin_lock_bh(&proc_inum_lock);
                 ida_remove(&proc_inum_ida, i);
-                spin_unlock(&proc_inum_lock);
+                spin_unlock_bh(&proc_inum_lock);
                 return -ENOSPC;
         }
         *inum = PROC_DYNAMIC_FIRST + i;
@@ -372,9 +372,9 @@ retry:
 
 void proc_free_inum(unsigned int inum)
 {
-        spin_lock(&proc_inum_lock);
+        spin_lock_bh(&proc_inum_lock);
         ida_remove(&proc_inum_ida, inum - PROC_DYNAMIC_FIRST);
-        spin_unlock(&proc_inum_lock);
+        spin_unlock_bh(&proc_inum_lock);
 }
 
 static void *proc_follow_link(struct dentry *dentry, struct nameidata *nd)
diff --git a/fs/read_write.c b/fs/read_write.c
index 1edaf099ddd..bb34af31528 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -935,6 +935,8 @@ ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, size_t count,
         if (retval > 0) {
                 add_rchar(current, retval);
                 add_wchar(current, retval);
+                fsnotify_access(in.file);
+                fsnotify_modify(out.file);
         }
 
         inc_syscr(current);