diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /fs/proc/inode.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/proc/inode.c')
| -rw-r--r-- | fs/proc/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 7ed72d6c1c6f..7737c5468a40 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c | |||
| @@ -445,7 +445,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de) | |||
| 445 | if (de->size) | 445 | if (de->size) |
| 446 | inode->i_size = de->size; | 446 | inode->i_size = de->size; |
| 447 | if (de->nlink) | 447 | if (de->nlink) |
| 448 | inode->i_nlink = de->nlink; | 448 | set_nlink(inode, de->nlink); |
| 449 | if (de->proc_iops) | 449 | if (de->proc_iops) |
| 450 | inode->i_op = de->proc_iops; | 450 | inode->i_op = de->proc_iops; |
| 451 | if (de->proc_fops) { | 451 | if (de->proc_fops) { |