aboutsummaryrefslogtreecommitdiffstats
path: root/fs/inode.c
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/inode.c
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/inode.c')
-rw-r--r--fs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 46a3e120b196..2cd2e48f7a20 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -735,7 +735,7 @@ repeat:
735#define LAST_INO_BATCH 1024 735#define LAST_INO_BATCH 1024
736static DEFINE_PER_CPU(unsigned int, last_ino); 736static DEFINE_PER_CPU(unsigned int, last_ino);
737 737
738static unsigned int get_next_ino(void) 738unsigned int get_next_ino(void)
739{ 739{
740 unsigned int *p = &get_cpu_var(last_ino); 740 unsigned int *p = &get_cpu_var(last_ino);
741 unsigned int res = *p; 741 unsigned int res = *p;
@@ -753,6 +753,7 @@ static unsigned int get_next_ino(void)
753 put_cpu_var(last_ino); 753 put_cpu_var(last_ino);
754 return res; 754 return res;
755} 755}
756EXPORT_SYMBOL(get_next_ino);
756 757
757/** 758/**
758 * new_inode - obtain an inode 759 * new_inode - obtain an inode
@@ -776,7 +777,6 @@ struct inode *new_inode(struct super_block *sb)
776 if (inode) { 777 if (inode) {
777 spin_lock(&inode_lock); 778 spin_lock(&inode_lock);
778 __inode_sb_list_add(inode); 779 __inode_sb_list_add(inode);
779 inode->i_ino = get_next_ino();
780 inode->i_state = 0; 780 inode->i_state = 0;
781 spin_unlock(&inode_lock); 781 spin_unlock(&inode_lock);
782 } 782 }