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 git://github.com/rustyrussell/linux
[pandora-kernel.git]
/
fs
/
proc
/
inode.c
diff --git
a/fs/proc/inode.c
b/fs/proc/inode.c
index
7ed72d6
..
7737c54
100644
(file)
--- 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)
if (de->size)
inode->i_size = de->size;
if (de->nlink)
-
inode->i_nlink = de->nlink
;
+
set_nlink(inode, de->nlink)
;
if (de->proc_iops)
inode->i_op = de->proc_iops;
if (de->proc_fops) {