summaryrefslogtreecommitdiff
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2005-01-12 22:50:27 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2005-01-12 22:50:27 -0800
commit0f76379ca92b8aee2771373e55a67f2631529506 (patch)
treecee1399116d9051cfd714b4b1c5207929d15e7e9 /include/linux/fs.h
parent240cdcf7cc2bdc55bc13a065dc737efc5e3d54ba (diff)
parentde10f9d45f6836709d77629cda7ad4e743e32cbe (diff)
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 31391d59ddc2..4d26f55c1299 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -68,8 +68,6 @@ extern int dir_notify_enable;
#endif
#define NR_FILE 8192 /* this can well be larger on a larger system */
-#define NR_RESERVED_FILES 10 /* reserved for root */
-#define NR_SUPER 256
#define MAY_EXEC 1
#define MAY_WRITE 2
@@ -1346,7 +1344,7 @@ static inline void invalidate_remote_inode(struct inode *inode)
invalidate_inode_pages(inode->i_mapping);
}
extern int invalidate_inode_pages2(struct address_space *mapping);
-extern void write_inode_now(struct inode *, int);
+extern int write_inode_now(struct inode *, int);
extern int filemap_fdatawrite(struct address_space *);
extern int filemap_flush(struct address_space *);
extern int filemap_fdatawait(struct address_space *);