Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 16 insertions, 12 deletions

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index e94ab398b717..ffab4783ac64 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -230,7 +230,6 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
                          * The inode is clean, unused
                          */
                         list_move(&inode->i_list, &inode_unused);
-                        inodes_stat.nr_unused++;
                 }
         }
         wake_up_inode(inode);
@@ -238,14 +237,20 @@ __sync_single_inode(struct inode *inode, struct writeback_control *wbc)
 }
 
 /*
- * Write out an inode's dirty pages.  Called under inode_lock.
+ * Write out an inode's dirty pages.  Called under inode_lock.  Either the
+ * caller has ref on the inode (either via __iget or via syscall against an fd)
+ * or the inode has I_WILL_FREE set (via generic_forget_inode)
  */
 static int
-__writeback_single_inode(struct inode *inode,
-                        struct writeback_control *wbc)
+__writeback_single_inode(struct inode *inode, struct writeback_control *wbc)
 {
         wait_queue_head_t *wqh;
 
+        if (!atomic_read(&inode->i_count))
+                WARN_ON(!(inode->i_state & I_WILL_FREE));
+        else
+                WARN_ON(inode->i_state & I_WILL_FREE);
+
         if ((wbc->sync_mode != WB_SYNC_ALL) && (inode->i_state & I_LOCK)) {
                 list_move(&inode->i_list, &inode->i_sb->s_dirty);
                 return 0;
@@ -259,11 +264,9 @@ __writeback_single_inode(struct inode *inode,
 
                 wqh = bit_waitqueue(&inode->i_state, __I_LOCK);
                 do {
-                        __iget(inode);
                         spin_unlock(&inode_lock);
                         __wait_on_bit(wqh, &wq, inode_wait,
                                                         TASK_UNINTERRUPTIBLE);
-                        iput(inode);
                         spin_lock(&inode_lock);
                 } while (inode->i_state & I_LOCK);
         }
@@ -541,14 +544,15 @@ void sync_inodes(int wait)
 }
 
 /**
- *      write_inode_now -       write an inode to disk
- *      @inode: inode to write to disk
- *      @sync: whether the write should be synchronous or not
+ * write_inode_now      -       write an inode to disk
+ * @inode: inode to write to disk
+ * @sync: whether the write should be synchronous or not
+ *
+ * This function commits an inode to disk immediately if it is dirty. This is
+ * primarily needed by knfsd.
  *
- *      This function commits an inode to disk immediately if it is
- *      dirty. This is primarily needed by knfsd.
+ * The caller must either have a ref on the inode or must have set I_WILL_FREE.
  */
- 
 int write_inode_now(struct inode *inode, int sync)
 {
         int ret;