diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /fs/proc/inode.c | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'fs/proc/inode.c')
| -rw-r--r-- | fs/proc/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 6f4e8dc97da1..b08d10017911 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
| @@ -425,7 +425,8 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino, | |||
| 425 | } | 425 | } |
| 426 | } | 426 | } |
| 427 | unlock_new_inode(inode); | 427 | unlock_new_inode(inode); |
| 428 | } | 428 | } else |
| 429 | module_put(de->owner); | ||
| 429 | return inode; | 430 | return inode; |
| 430 | 431 | ||
| 431 | out_ino: | 432 | out_ino: |