git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
[pandora-kernel.git]
/
fs
/
inode.c
diff --git
a/fs/inode.c
b/fs/inode.c
index
27ee1af
..
c36d948
100644
(file)
--- a/
fs/inode.c
+++ b/
fs/inode.c
@@
-495,8
+495,7
@@
static struct inode * find_inode(struct super_block * sb, struct hlist_head *hea
struct inode * inode = NULL;
repeat:
struct inode * inode = NULL;
repeat:
- hlist_for_each (node, head) {
- inode = hlist_entry(node, struct inode, i_hash);
+ hlist_for_each_entry(inode, node, head, i_hash) {
if (inode->i_sb != sb)
continue;
if (!test(inode, data))
if (inode->i_sb != sb)
continue;
if (!test(inode, data))
@@
-520,8
+519,7
@@
static struct inode * find_inode_fast(struct super_block * sb, struct hlist_head
struct inode * inode = NULL;
repeat:
struct inode * inode = NULL;
repeat:
- hlist_for_each (node, head) {
- inode = hlist_entry(node, struct inode, i_hash);
+ hlist_for_each_entry(inode, node, head, i_hash) {
if (inode->i_ino != ino)
continue;
if (inode->i_sb != sb)
if (inode->i_ino != ino)
continue;
if (inode->i_sb != sb)
@@
-1151,13
+1149,8
@@
static inline void iput_final(struct inode *inode)
void iput(struct inode *inode)
{
if (inode) {
void iput(struct inode *inode)
{
if (inode) {
- const struct super_operations *op = inode->i_sb->s_op;
-
BUG_ON(inode->i_state == I_CLEAR);
BUG_ON(inode->i_state == I_CLEAR);
- if (op && op->put_inode)
- op->put_inode(inode);
-
if (atomic_dec_and_lock(&inode->i_count, &inode_lock))
iput_final(inode);
}
if (atomic_dec_and_lock(&inode->i_count, &inode_lock))
iput_final(inode);
}