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/hppfs/hppfs.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'fs/hppfs/hppfs.c')
| -rw-r--r-- | fs/hppfs/hppfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c index 970ea987b3f6..f590b1160c6c 100644 --- a/fs/hppfs/hppfs.c +++ b/fs/hppfs/hppfs.c | |||
| @@ -702,7 +702,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry) | |||
| 702 | inode->i_ctime = proc_ino->i_ctime; | 702 | inode->i_ctime = proc_ino->i_ctime; |
| 703 | inode->i_ino = proc_ino->i_ino; | 703 | inode->i_ino = proc_ino->i_ino; |
| 704 | inode->i_mode = proc_ino->i_mode; | 704 | inode->i_mode = proc_ino->i_mode; |
| 705 | inode->i_nlink = proc_ino->i_nlink; | 705 | set_nlink(inode, proc_ino->i_nlink); |
| 706 | inode->i_size = proc_ino->i_size; | 706 | inode->i_size = proc_ino->i_size; |
| 707 | inode->i_blocks = proc_ino->i_blocks; | 707 | inode->i_blocks = proc_ino->i_blocks; |
| 708 | 708 | ||