* [PATCH 6/58] Take ->i_bdev/->i_cdev handling out of clear_inode()
@ 2010-06-08 22:15 Al Viro
0 siblings, 0 replies; only message in thread
From: Al Viro @ 2010-06-08 22:15 UTC (permalink / raw)
To: linux-fsdevel
All call chains to clear_inode() pass through evict_inode() and
clear_inode() should be called by evict_inode() exactly once.
So we can pull i_bdev/i_cdev detaching up to evict_inode() itself.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/inode.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/inode.c b/fs/inode.c
index be2ba5b..139d475 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -313,10 +313,6 @@ void clear_inode(struct inode *inode)
inode_sync_wait(inode);
if (inode->i_sb->s_op->clear_inode)
inode->i_sb->s_op->clear_inode(inode);
- if (S_ISBLK(inode->i_mode) && inode->i_bdev)
- bd_forget(inode);
- if (S_ISCHR(inode->i_mode) && inode->i_cdev)
- cd_forget(inode);
inode->i_state = I_FREEING | I_CLEAR;
}
EXPORT_SYMBOL(clear_inode);
@@ -334,6 +330,10 @@ static void evict(struct inode *inode, int delete)
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
}
+ if (S_ISBLK(inode->i_mode) && inode->i_bdev)
+ bd_forget(inode);
+ if (S_ISCHR(inode->i_mode) && inode->i_cdev)
+ cd_forget(inode);
}
/*
--
1.5.6.5
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-06-08 22:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-08 22:15 [PATCH 6/58] Take ->i_bdev/->i_cdev handling out of clear_inode() Al Viro
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.