diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /fs/inode.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/fs/inode.c b/fs/inode.c index 10ee82c12..2b8f7a198 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -8,6 +8,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/dcache.h> +#include <linux/quotaops.h> /* * New inode.c implementation. @@ -64,7 +65,7 @@ struct { int dummy[4]; } inodes_stat = {0, 0, 0,}; -int max_inodes = NR_INODE; +int max_inodes; /* * Put the inode on the super block's dirty list. @@ -190,6 +191,7 @@ void sync_inodes(kdev_t dev) continue; sync_list(&sb->s_dirty); + if (dev) break; } @@ -223,8 +225,8 @@ void clear_inode(struct inode *inode) if (inode->i_nrpages) truncate_inode_pages(inode, 0); wait_on_inode(inode); - if (IS_WRITABLE(inode) && inode->i_sb && inode->i_sb->dq_op) - inode->i_sb->dq_op->drop(inode); + if (IS_QUOTAINIT(inode)) + DQUOT_DROP(inode); if (inode->i_sb && inode->i_sb->s_op && inode->i_sb->s_op->clear_inode) inode->i_sb->s_op->clear_inode(inode); @@ -535,6 +537,7 @@ add_new_inode: inode->i_sb = NULL; inode->i_dev = 0; inode->i_ino = ++last_ino; + inode->i_flags = 0; inode->i_count = 1; inode->i_state = 0; spin_unlock(&inode_lock); @@ -594,9 +597,9 @@ add_new_inode: } /* - * Uhhuh.. We need to expand. Note that "grow_inodes()" will - * release the spinlock, but will return with the lock held - * again if the allocation succeeded. + * We need to expand. Note that "grow_inodes()" will + * release the spinlock, but will return with the lock + * held again if the allocation succeeded. */ inode = grow_inodes(); if (inode) { @@ -731,11 +734,14 @@ int bmap(struct inode * inode, int block) } /* - * Initialize the hash tables + * Initialize the hash tables and default + * value for max inodes.. */ +#define MAX_INODE (8192) + void inode_init(void) { - int i; + int i, max; struct list_head *head = inode_hashtable; i = HASH_SIZE; @@ -744,6 +750,12 @@ void inode_init(void) head++; i--; } while (i); + + /* Initial guess at reasonable inode number */ + max = num_physpages >> 1; + if (max > MAX_INODE) + max = MAX_INODE; + max_inodes = max; } /* This belongs in file_table.c, not here... */ |