Attachment 155360 Details for Bug 236786 – correct nr_unused accounting

[patch] correct nr_unused accounting

fix-nr_unused-accounting.patch (text/plain), 1.82 KB, created by Bryn M. Reeves on 2007-05-24 16:11:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2007-05-24 16:11:49 UTC

Size: 1.82 KB

patch

obsolete

>--- linux-2.6.9/fs/fs-writeback.c.nr_unused	2007-05-09 14:27:58.000000000 +0100
>+++ linux-2.6.9/fs/fs-writeback.c	2007-05-09 14:35:14.000000000 +0100
>@@ -230,7 +230,6 @@
> 			 * The inode is clean, unused
> 			 */
> 			list_move(&inode->i_list, &inode_unused);
>-			inodes_stat.nr_unused++;
> 		}
> 	}
> 	wake_up_inode(inode);
>@@ -238,12 +237,19 @@
> }
> 
> /*
>- * 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)
> {
>+	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;
>@@ -253,10 +259,8 @@
> 	 * It's a data-integrity sync.  We must wait.
> 	 */
> 	while (inode->i_state & I_LOCK) {
>-		__iget(inode);
> 		spin_unlock(&inode_lock);
> 		__wait_on_inode(inode);
>-		iput(inode);
> 		spin_lock(&inode_lock);
> 	}
> 	return __sync_single_inode(inode, wbc);
>@@ -549,6 +553,8 @@
>  *	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.
>+ *
>  *      Returns 0 on success else -ERR.
>  */
>  
>--- linux-2.6.9/fs/inode.c.nr_unused	2007-05-09 14:28:14.000000000 +0100
>+++ linux-2.6.9/fs/inode.c	2007-05-09 14:35:41.000000000 +0100
>@@ -1055,6 +1055,7 @@
> 	if (inode->i_data.nrpages)
> 		truncate_inode_pages(&inode->i_data, 0);
> 	clear_inode(inode);
>+	wake_up_inode(inode);
> 	destroy_inode(inode);
> }
>

Actions: View | Diff

Attachments on bug 236786: 155360