diff options
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 2620a8c63571..5c7e0ff370ba 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -15,8 +15,8 @@ | |||
15 | * nr_file rlimit, so it's safe to set up a ridiculously high absolute | 15 | * nr_file rlimit, so it's safe to set up a ridiculously high absolute |
16 | * upper limit on files-per-process. | 16 | * upper limit on files-per-process. |
17 | * | 17 | * |
18 | * Some programs (notably those using select()) may have to be | 18 | * Some programs (notably those using select()) may have to be |
19 | * recompiled to take full advantage of the new limits.. | 19 | * recompiled to take full advantage of the new limits.. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* Fixed constants first: */ | 22 | /* Fixed constants first: */ |
@@ -169,7 +169,7 @@ struct inodes_stat_t { | |||
169 | #define SEL_EX 4 | 169 | #define SEL_EX 4 |
170 | 170 | ||
171 | /* public flags for file_system_type */ | 171 | /* public flags for file_system_type */ |
172 | #define FS_REQUIRES_DEV 1 | 172 | #define FS_REQUIRES_DEV 1 |
173 | #define FS_BINARY_MOUNTDATA 2 | 173 | #define FS_BINARY_MOUNTDATA 2 |
174 | #define FS_HAS_SUBTYPE 4 | 174 | #define FS_HAS_SUBTYPE 4 |
175 | #define FS_REVAL_DOT 16384 /* Check the paths ".", ".." for staleness */ | 175 | #define FS_REVAL_DOT 16384 /* Check the paths ".", ".." for staleness */ |
@@ -466,7 +466,7 @@ struct iattr { | |||
466 | */ | 466 | */ |
467 | #include <linux/quota.h> | 467 | #include <linux/quota.h> |
468 | 468 | ||
469 | /** | 469 | /** |
470 | * enum positive_aop_returns - aop return codes with specific semantics | 470 | * enum positive_aop_returns - aop return codes with specific semantics |
471 | * | 471 | * |
472 | * @AOP_WRITEPAGE_ACTIVATE: Informs the caller that page writeback has | 472 | * @AOP_WRITEPAGE_ACTIVATE: Informs the caller that page writeback has |
@@ -476,7 +476,7 @@ struct iattr { | |||
476 | * be a candidate for writeback again in the near | 476 | * be a candidate for writeback again in the near |
477 | * future. Other callers must be careful to unlock | 477 | * future. Other callers must be careful to unlock |
478 | * the page if they get this return. Returned by | 478 | * the page if they get this return. Returned by |
479 | * writepage(); | 479 | * writepage(); |
480 | * | 480 | * |
481 | * @AOP_TRUNCATED_PAGE: The AOP method that was handed a locked page has | 481 | * @AOP_TRUNCATED_PAGE: The AOP method that was handed a locked page has |
482 | * unlocked it and the page might have been truncated. | 482 | * unlocked it and the page might have been truncated. |
@@ -715,6 +715,7 @@ static inline int mapping_writably_mapped(struct address_space *mapping) | |||
715 | 715 | ||
716 | struct posix_acl; | 716 | struct posix_acl; |
717 | #define ACL_NOT_CACHED ((void *)(-1)) | 717 | #define ACL_NOT_CACHED ((void *)(-1)) |
718 | struct inode_obj_id_table; | ||
718 | 719 | ||
719 | struct inode { | 720 | struct inode { |
720 | struct hlist_node i_hash; | 721 | struct hlist_node i_hash; |
@@ -783,6 +784,8 @@ struct inode { | |||
783 | struct posix_acl *i_acl; | 784 | struct posix_acl *i_acl; |
784 | struct posix_acl *i_default_acl; | 785 | struct posix_acl *i_default_acl; |
785 | #endif | 786 | #endif |
787 | struct list_head i_obj_list; | ||
788 | struct mutex i_obj_mutex; | ||
786 | void *i_private; /* fs or device private pointer */ | 789 | void *i_private; /* fs or device private pointer */ |
787 | }; | 790 | }; |
788 | 791 | ||
@@ -995,10 +998,10 @@ static inline int file_check_writeable(struct file *filp) | |||
995 | 998 | ||
996 | #define MAX_NON_LFS ((1UL<<31) - 1) | 999 | #define MAX_NON_LFS ((1UL<<31) - 1) |
997 | 1000 | ||
998 | /* Page cache limit. The filesystems should put that into their s_maxbytes | 1001 | /* Page cache limit. The filesystems should put that into their s_maxbytes |
999 | limits, otherwise bad things can happen in VM. */ | 1002 | limits, otherwise bad things can happen in VM. */ |
1000 | #if BITS_PER_LONG==32 | 1003 | #if BITS_PER_LONG==32 |
1001 | #define MAX_LFS_FILESIZE (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) | 1004 | #define MAX_LFS_FILESIZE (((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1) |
1002 | #elif BITS_PER_LONG==64 | 1005 | #elif BITS_PER_LONG==64 |
1003 | #define MAX_LFS_FILESIZE 0x7fffffffffffffffUL | 1006 | #define MAX_LFS_FILESIZE 0x7fffffffffffffffUL |
1004 | #endif | 1007 | #endif |
@@ -2139,7 +2142,7 @@ extern int may_open(struct path *, int, int); | |||
2139 | 2142 | ||
2140 | extern int kernel_read(struct file *, loff_t, char *, unsigned long); | 2143 | extern int kernel_read(struct file *, loff_t, char *, unsigned long); |
2141 | extern struct file * open_exec(const char *); | 2144 | extern struct file * open_exec(const char *); |
2142 | 2145 | ||
2143 | /* fs/dcache.c -- generic fs support functions */ | 2146 | /* fs/dcache.c -- generic fs support functions */ |
2144 | extern int is_subdir(struct dentry *, struct dentry *); | 2147 | extern int is_subdir(struct dentry *, struct dentry *); |
2145 | extern ino_t find_inode_number(struct dentry *, struct qstr *); | 2148 | extern ino_t find_inode_number(struct dentry *, struct qstr *); |