diff options
Diffstat (limited to 'fs/ext2')
-rw-r--r-- | fs/ext2/acl.c | 11 | ||||
-rw-r--r-- | fs/ext2/acl.h | 2 | ||||
-rw-r--r-- | fs/ext2/dir.c | 19 | ||||
-rw-r--r-- | fs/ext2/namei.c | 2 | ||||
-rw-r--r-- | fs/ext2/super.c | 34 |
5 files changed, 50 insertions, 18 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 2bcc0431bada..7b4180554a62 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c | |||
@@ -232,10 +232,17 @@ ext2_set_acl(struct inode *inode, int type, struct posix_acl *acl) | |||
232 | } | 232 | } |
233 | 233 | ||
234 | int | 234 | int |
235 | ext2_check_acl(struct inode *inode, int mask) | 235 | ext2_check_acl(struct inode *inode, int mask, unsigned int flags) |
236 | { | 236 | { |
237 | struct posix_acl *acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); | 237 | struct posix_acl *acl; |
238 | |||
239 | if (flags & IPERM_FLAG_RCU) { | ||
240 | if (!negative_cached_acl(inode, ACL_TYPE_ACCESS)) | ||
241 | return -ECHILD; | ||
242 | return -EAGAIN; | ||
243 | } | ||
238 | 244 | ||
245 | acl = ext2_get_acl(inode, ACL_TYPE_ACCESS); | ||
239 | if (IS_ERR(acl)) | 246 | if (IS_ERR(acl)) |
240 | return PTR_ERR(acl); | 247 | return PTR_ERR(acl); |
241 | if (acl) { | 248 | if (acl) { |
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h index 3ff6cbb9ac44..c939b7b12099 100644 --- a/fs/ext2/acl.h +++ b/fs/ext2/acl.h | |||
@@ -54,7 +54,7 @@ static inline int ext2_acl_count(size_t size) | |||
54 | #ifdef CONFIG_EXT2_FS_POSIX_ACL | 54 | #ifdef CONFIG_EXT2_FS_POSIX_ACL |
55 | 55 | ||
56 | /* acl.c */ | 56 | /* acl.c */ |
57 | extern int ext2_check_acl (struct inode *, int); | 57 | extern int ext2_check_acl (struct inode *, int, unsigned int); |
58 | extern int ext2_acl_chmod (struct inode *); | 58 | extern int ext2_acl_chmod (struct inode *); |
59 | extern int ext2_init_acl (struct inode *, struct inode *); | 59 | extern int ext2_init_acl (struct inode *, struct inode *); |
60 | 60 | ||
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 2709b34206ab..47cda410b548 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c | |||
@@ -28,21 +28,30 @@ | |||
28 | 28 | ||
29 | typedef struct ext2_dir_entry_2 ext2_dirent; | 29 | typedef struct ext2_dir_entry_2 ext2_dirent; |
30 | 30 | ||
31 | /* | ||
32 | * Tests against MAX_REC_LEN etc were put in place for 64k block | ||
33 | * sizes; if that is not possible on this arch, we can skip | ||
34 | * those tests and speed things up. | ||
35 | */ | ||
31 | static inline unsigned ext2_rec_len_from_disk(__le16 dlen) | 36 | static inline unsigned ext2_rec_len_from_disk(__le16 dlen) |
32 | { | 37 | { |
33 | unsigned len = le16_to_cpu(dlen); | 38 | unsigned len = le16_to_cpu(dlen); |
34 | 39 | ||
40 | #if (PAGE_CACHE_SIZE >= 65536) | ||
35 | if (len == EXT2_MAX_REC_LEN) | 41 | if (len == EXT2_MAX_REC_LEN) |
36 | return 1 << 16; | 42 | return 1 << 16; |
43 | #endif | ||
37 | return len; | 44 | return len; |
38 | } | 45 | } |
39 | 46 | ||
40 | static inline __le16 ext2_rec_len_to_disk(unsigned len) | 47 | static inline __le16 ext2_rec_len_to_disk(unsigned len) |
41 | { | 48 | { |
49 | #if (PAGE_CACHE_SIZE >= 65536) | ||
42 | if (len == (1 << 16)) | 50 | if (len == (1 << 16)) |
43 | return cpu_to_le16(EXT2_MAX_REC_LEN); | 51 | return cpu_to_le16(EXT2_MAX_REC_LEN); |
44 | else | 52 | else |
45 | BUG_ON(len > (1 << 16)); | 53 | BUG_ON(len > (1 << 16)); |
54 | #endif | ||
46 | return cpu_to_le16(len); | 55 | return cpu_to_le16(len); |
47 | } | 56 | } |
48 | 57 | ||
@@ -129,15 +138,15 @@ static void ext2_check_page(struct page *page, int quiet) | |||
129 | p = (ext2_dirent *)(kaddr + offs); | 138 | p = (ext2_dirent *)(kaddr + offs); |
130 | rec_len = ext2_rec_len_from_disk(p->rec_len); | 139 | rec_len = ext2_rec_len_from_disk(p->rec_len); |
131 | 140 | ||
132 | if (rec_len < EXT2_DIR_REC_LEN(1)) | 141 | if (unlikely(rec_len < EXT2_DIR_REC_LEN(1))) |
133 | goto Eshort; | 142 | goto Eshort; |
134 | if (rec_len & 3) | 143 | if (unlikely(rec_len & 3)) |
135 | goto Ealign; | 144 | goto Ealign; |
136 | if (rec_len < EXT2_DIR_REC_LEN(p->name_len)) | 145 | if (unlikely(rec_len < EXT2_DIR_REC_LEN(p->name_len))) |
137 | goto Enamelen; | 146 | goto Enamelen; |
138 | if (((offs + rec_len - 1) ^ offs) & ~(chunk_size-1)) | 147 | if (unlikely(((offs + rec_len - 1) ^ offs) & ~(chunk_size-1))) |
139 | goto Espan; | 148 | goto Espan; |
140 | if (le32_to_cpu(p->inode) > max_inumber) | 149 | if (unlikely(le32_to_cpu(p->inode) > max_inumber)) |
141 | goto Einumber; | 150 | goto Einumber; |
142 | } | 151 | } |
143 | if (offs != limit) | 152 | if (offs != limit) |
diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c index f8aecd2e3297..2e1d8341d827 100644 --- a/fs/ext2/namei.c +++ b/fs/ext2/namei.c | |||
@@ -67,7 +67,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str | |||
67 | inode = NULL; | 67 | inode = NULL; |
68 | if (ino) { | 68 | if (ino) { |
69 | inode = ext2_iget(dir->i_sb, ino); | 69 | inode = ext2_iget(dir->i_sb, ino); |
70 | if (unlikely(IS_ERR(inode))) { | 70 | if (IS_ERR(inode)) { |
71 | if (PTR_ERR(inode) == -ESTALE) { | 71 | if (PTR_ERR(inode) == -ESTALE) { |
72 | ext2_error(dir->i_sb, __func__, | 72 | ext2_error(dir->i_sb, __func__, |
73 | "deleted inode referenced: %lu", | 73 | "deleted inode referenced: %lu", |
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index d89e0b6a2d78..7731695e65d9 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -43,9 +43,10 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data); | |||
43 | static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf); | 43 | static int ext2_statfs (struct dentry * dentry, struct kstatfs * buf); |
44 | static int ext2_sync_fs(struct super_block *sb, int wait); | 44 | static int ext2_sync_fs(struct super_block *sb, int wait); |
45 | 45 | ||
46 | void ext2_error (struct super_block * sb, const char * function, | 46 | void ext2_error(struct super_block *sb, const char *function, |
47 | const char * fmt, ...) | 47 | const char *fmt, ...) |
48 | { | 48 | { |
49 | struct va_format vaf; | ||
49 | va_list args; | 50 | va_list args; |
50 | struct ext2_sb_info *sbi = EXT2_SB(sb); | 51 | struct ext2_sb_info *sbi = EXT2_SB(sb); |
51 | struct ext2_super_block *es = sbi->s_es; | 52 | struct ext2_super_block *es = sbi->s_es; |
@@ -59,9 +60,13 @@ void ext2_error (struct super_block * sb, const char * function, | |||
59 | } | 60 | } |
60 | 61 | ||
61 | va_start(args, fmt); | 62 | va_start(args, fmt); |
62 | printk(KERN_CRIT "EXT2-fs (%s): error: %s: ", sb->s_id, function); | 63 | |
63 | vprintk(fmt, args); | 64 | vaf.fmt = fmt; |
64 | printk("\n"); | 65 | vaf.va = &args; |
66 | |||
67 | printk(KERN_CRIT "EXT2-fs (%s): error: %s: %pV\n", | ||
68 | sb->s_id, function, &vaf); | ||
69 | |||
65 | va_end(args); | 70 | va_end(args); |
66 | 71 | ||
67 | if (test_opt(sb, ERRORS_PANIC)) | 72 | if (test_opt(sb, ERRORS_PANIC)) |
@@ -76,12 +81,16 @@ void ext2_error (struct super_block * sb, const char * function, | |||
76 | void ext2_msg(struct super_block *sb, const char *prefix, | 81 | void ext2_msg(struct super_block *sb, const char *prefix, |
77 | const char *fmt, ...) | 82 | const char *fmt, ...) |
78 | { | 83 | { |
84 | struct va_format vaf; | ||
79 | va_list args; | 85 | va_list args; |
80 | 86 | ||
81 | va_start(args, fmt); | 87 | va_start(args, fmt); |
82 | printk("%sEXT2-fs (%s): ", prefix, sb->s_id); | 88 | |
83 | vprintk(fmt, args); | 89 | vaf.fmt = fmt; |
84 | printk("\n"); | 90 | vaf.va = &args; |
91 | |||
92 | printk("%sEXT2-fs (%s): %pV\n", prefix, sb->s_id, &vaf); | ||
93 | |||
85 | va_end(args); | 94 | va_end(args); |
86 | } | 95 | } |
87 | 96 | ||
@@ -161,11 +170,18 @@ static struct inode *ext2_alloc_inode(struct super_block *sb) | |||
161 | return &ei->vfs_inode; | 170 | return &ei->vfs_inode; |
162 | } | 171 | } |
163 | 172 | ||
164 | static void ext2_destroy_inode(struct inode *inode) | 173 | static void ext2_i_callback(struct rcu_head *head) |
165 | { | 174 | { |
175 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
176 | INIT_LIST_HEAD(&inode->i_dentry); | ||
166 | kmem_cache_free(ext2_inode_cachep, EXT2_I(inode)); | 177 | kmem_cache_free(ext2_inode_cachep, EXT2_I(inode)); |
167 | } | 178 | } |
168 | 179 | ||
180 | static void ext2_destroy_inode(struct inode *inode) | ||
181 | { | ||
182 | call_rcu(&inode->i_rcu, ext2_i_callback); | ||
183 | } | ||
184 | |||
169 | static void init_once(void *foo) | 185 | static void init_once(void *foo) |
170 | { | 186 | { |
171 | struct ext2_inode_info *ei = (struct ext2_inode_info *) foo; | 187 | struct ext2_inode_info *ei = (struct ext2_inode_info *) foo; |