aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2010-10-23 11:19:54 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-10-25 21:26:11 -0400
commit85fe4025c616a7c0ed07bc2fc8c5371b07f3888c (patch)
tree7a5db7accb6192f2911f2473b4e3191227b914cc /fs/proc
parentf991bd2e14210fb93d722cb23e54991de20e8a3d (diff)
fs: do not assign default i_ino in new_inode
Instead of always assigning an increasing inode number in new_inode move the call to assign it into those callers that actually need it. For now callers that need it is estimated conservatively, that is the call is added to all filesystems that do not assign an i_ino by themselves. For a few more filesystems we can avoid assigning any inode number given that they aren't user visible, and for others it could be done lazily when an inode number is actually needed, but that's left for later patches. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/base.c2
-rw-r--r--fs/proc/proc_sysctl.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c
index fb2a5abd4e4f..9883f1e18332 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1603,6 +1603,7 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
1603 1603
1604 /* Common stuff */ 1604 /* Common stuff */
1605 ei = PROC_I(inode); 1605 ei = PROC_I(inode);
1606 inode->i_ino = get_next_ino();
1606 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; 1607 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
1607 inode->i_op = &proc_def_inode_operations; 1608 inode->i_op = &proc_def_inode_operations;
1608 1609
@@ -2549,6 +2550,7 @@ static struct dentry *proc_base_instantiate(struct inode *dir,
2549 2550
2550 /* Initialize the inode */ 2551 /* Initialize the inode */
2551 ei = PROC_I(inode); 2552 ei = PROC_I(inode);
2553 inode->i_ino = get_next_ino();
2552 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; 2554 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
2553 2555
2554 /* 2556 /*
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 2fc52552271d..b652cb00906b 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -23,6 +23,8 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
23 if (!inode) 23 if (!inode)
24 goto out; 24 goto out;
25 25
26 inode->i_ino = get_next_ino();
27
26 sysctl_head_get(head); 28 sysctl_head_get(head);
27 ei = PROC_I(inode); 29 ei = PROC_I(inode);
28 ei->sysctl = head; 30 ei->sysctl = head;