Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

6 files changed, 27 insertions, 31 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 20bb919eb195..5a28b69ad223 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -457,6 +457,8 @@ static inline struct kiocb *aio_get_req(struct kioctx *ctx)
 
 static inline void really_put_req(struct kioctx *ctx, struct kiocb *req)
 {
+        assert_spin_locked(&ctx->ctx_lock);
+
         if (req->ki_dtor)
                 req->ki_dtor(req);
         kmem_cache_free(kiocb_cachep, req);
@@ -498,6 +500,8 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
         dprintk(KERN_DEBUG "aio_put(%p): f_count=%d\n",
                 req, atomic_read(&req->ki_filp->f_count));
 
+        assert_spin_locked(&ctx->ctx_lock);
+
         req->ki_users --;
         if (unlikely(req->ki_users < 0))
                 BUG();
@@ -619,14 +623,13 @@ static void unuse_mm(struct mm_struct *mm)
  * the kiocb (to tell the caller to activate the work
  * queue to process it), or 0, if it found that it was
  * already queued.
- *
- * Should be called with the spin lock iocb->ki_ctx->ctx_lock
- * held
  */
 static inline int __queue_kicked_iocb(struct kiocb *iocb)
 {
         struct kioctx *ctx = iocb->ki_ctx;
 
+        assert_spin_locked(&ctx->ctx_lock);
+
         if (list_empty(&iocb->ki_run_list)) {
                 list_add_tail(&iocb->ki_run_list,
                         &ctx->run_list);
@@ -771,13 +774,15 @@ out:
  *      Process all pending retries queued on the ioctx
  *      run list.
  * Assumes it is operating within the aio issuer's mm
- * context. Expects to be called with ctx->ctx_lock held
+ * context.
  */
 static int __aio_run_iocbs(struct kioctx *ctx)
 {
         struct kiocb *iocb;
         LIST_HEAD(run_list);
 
+        assert_spin_locked(&ctx->ctx_lock);
+
         list_splice_init(&ctx->run_list, &run_list);
         while (!list_empty(&run_list)) {
                 iocb = list_entry(run_list.next, struct kiocb,
@@ -937,28 +942,19 @@ int fastcall aio_complete(struct kiocb *iocb, long res, long res2)
         unsigned long   tail;
         int             ret;
 
-        /* Special case handling for sync iocbs: events go directly
-         * into the iocb for fast handling.  Note that this will not 
-         * work if we allow sync kiocbs to be cancelled. in which
-         * case the usage count checks will have to move under ctx_lock
-         * for all cases.
+        /*
+         * Special case handling for sync iocbs:
+         *  - events go directly into the iocb for fast handling
+         *  - the sync task with the iocb in its stack holds the single iocb
+         *    ref, no other paths have a way to get another ref
+         *  - the sync task helpfully left a reference to itself in the iocb
          */
         if (is_sync_kiocb(iocb)) {
-                int ret;
-
+                BUG_ON(iocb->ki_users != 1);
                 iocb->ki_user_data = res;
-                if (iocb->ki_users == 1) {
-                        iocb->ki_users = 0;
-                        ret = 1;
-                } else {
-                        spin_lock_irq(&ctx->ctx_lock);
-                        iocb->ki_users--;
-                        ret = (0 == iocb->ki_users);
-                        spin_unlock_irq(&ctx->ctx_lock);
-                }
-                /* sync iocbs put the task here for us */
+                iocb->ki_users = 0;
                 wake_up_process(iocb->ki_obj.tsk);
-                return ret;
+                return 1;
         }
 
         info = &ctx->ring_info;
@@ -1613,12 +1609,14 @@ asmlinkage long sys_io_submit(aio_context_t ctx_id, long nr,
 
 /* lookup_kiocb
  *      Finds a given iocb for cancellation.
- *      MUST be called with ctx->ctx_lock held.
  */
 static struct kiocb *lookup_kiocb(struct kioctx *ctx, struct iocb __user *iocb,
                                   u32 key)
 {
         struct list_head *pos;
+
+        assert_spin_locked(&ctx->ctx_lock);
+
         /* TODO: use a hash or array, this sucks. */
         list_for_each(pos, &ctx->active_reqs) {
                 struct kiocb *kiocb = list_kiocb(pos);
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index e4ed4b31a433..522fa70dd8ea 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -881,7 +881,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
         }
         if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
                 ext2_warning(sb, __FUNCTION__,
-                        "mounting ext3 filesystem as ext2\n");
+                        "mounting ext3 filesystem as ext2");
         ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY);
         percpu_counter_mod(&sbi->s_freeblocks_counter,
                                 ext2_count_free_blocks(sb));
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 5d9b00e28837..8824e84f8a56 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1384,8 +1384,10 @@ static int ext3_journalled_writepage(struct page *page,
                 ClearPageChecked(page);
                 ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE,
                                         ext3_get_block);
-                if (ret != 0)
+                if (ret != 0) {
+                        ext3_journal_stop(handle);
                         goto out_unlock;
+                }
                 ret = walk_page_buffers(handle, page_buffers(page), 0,
                         PAGE_CACHE_SIZE, NULL, do_journal_get_write_access);
 
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 0e7456ec99fd..3e51dd1da8aa 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -284,9 +284,6 @@ int jffs2_fill_scan_buf (struct jffs2_sb_info *c, void *buf,
                 D1(printk(KERN_WARNING "Read at 0x%x gave only 0x%zx bytes\n", ofs, retlen));
                 return -EIO;
         }
-        D2(printk(KERN_DEBUG "Read 0x%x bytes from 0x%08x into buf\n", len, ofs));
-        D2(printk(KERN_DEBUG "000: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                  buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13], buf[14], buf[15]));
         return 0;
 }
 
diff --git a/fs/locks.c b/fs/locks.c
index a1e8b2248014..250ef53d25ef 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1105,7 +1105,6 @@ static void time_out_leases(struct inode *inode)
                         before = &fl->fl_next;
                         continue;
                 }
-                printk(KERN_INFO "lease broken - owner pid = %d\n", fl->fl_pid);
                 lease_modify(before, fl->fl_type & ~F_INPROGRESS);
                 if (fl == *before)      /* lease_modify may have freed fl */
                         before = &fl->fl_next;
@@ -1430,7 +1429,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
         lock_kernel();
 
         error = __setlease(filp, arg, &flp);
-        if (error)
+        if (error || arg == F_UNLCK)
                 goto out_unlock;
 
         error = fasync_helper(fd, filp, 1, &flp->fl_fasync);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index d2fa42006d8f..9ab97cef0daa 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -195,7 +195,7 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
 
 static int show_map(struct seq_file *m, void *v)
 {
-        return show_map_internal(m, v, 0);
+        return show_map_internal(m, v, NULL);
 }
 
 static void smaps_pte_range(struct vm_area_struct *vma, pmd_t *pmd,