diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 23:35:01 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-29 23:35:01 -0400 |
commit | 6ffc1fee98c4b995eb3a0285f4f8fb467cb0306e (patch) | |
tree | 69a05892a41e7f7400fa598ee0bdf8027c8f0fd6 /fs/inode.c | |
parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
parent | 7c1ff4c544dd650cceff3cd69a04bcba60856678 (diff) |
Merge branch 'master' into wip-merge-2.6.34
Simple merge between master and 2.6.34 with conflicts resolved.
This commit does not compile, the following main problems are still
unresolved:
- spinlock -> raw_spinlock API changes
- kfifo API changes
- sched_class API changes
Conflicts:
Makefile
arch/x86/include/asm/hw_irq.h
arch/x86/include/asm/unistd_32.h
arch/x86/kernel/syscall_table_32.S
include/linux/hrtimer.h
kernel/sched.c
kernel/sched_fair.c
Diffstat (limited to 'fs/inode.c')
-rw-r--r-- | fs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/inode.c b/fs/inode.c index 407bf392e20a..aaaaf096aa8e 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -271,6 +271,8 @@ void inode_init_once(struct inode *inode) | |||
271 | #ifdef CONFIG_FSNOTIFY | 271 | #ifdef CONFIG_FSNOTIFY |
272 | INIT_HLIST_HEAD(&inode->i_fsnotify_mark_entries); | 272 | INIT_HLIST_HEAD(&inode->i_fsnotify_mark_entries); |
273 | #endif | 273 | #endif |
274 | INIT_LIST_HEAD(&inode->i_obj_list); | ||
275 | mutex_init(&inode->i_obj_mutex); | ||
274 | } | 276 | } |
275 | EXPORT_SYMBOL(inode_init_once); | 277 | EXPORT_SYMBOL(inode_init_once); |
276 | 278 | ||