diff options
Diffstat (limited to 'fs/afs')
-rw-r--r-- | fs/afs/dir.c | 10 | ||||
-rw-r--r-- | fs/afs/internal.h | 2 | ||||
-rw-r--r-- | fs/afs/security.c | 7 | ||||
-rw-r--r-- | fs/afs/super.c | 10 |
4 files changed, 22 insertions, 7 deletions
diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 5439e1bc9a8..34a3263d60a 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
16 | #include <linux/namei.h> | ||
16 | #include <linux/pagemap.h> | 17 | #include <linux/pagemap.h> |
17 | #include <linux/ctype.h> | 18 | #include <linux/ctype.h> |
18 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
@@ -23,7 +24,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, | |||
23 | static int afs_dir_open(struct inode *inode, struct file *file); | 24 | static int afs_dir_open(struct inode *inode, struct file *file); |
24 | static int afs_readdir(struct file *file, void *dirent, filldir_t filldir); | 25 | static int afs_readdir(struct file *file, void *dirent, filldir_t filldir); |
25 | static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd); | 26 | static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd); |
26 | static int afs_d_delete(struct dentry *dentry); | 27 | static int afs_d_delete(const struct dentry *dentry); |
27 | static void afs_d_release(struct dentry *dentry); | 28 | static void afs_d_release(struct dentry *dentry); |
28 | static int afs_lookup_filldir(void *_cookie, const char *name, int nlen, | 29 | static int afs_lookup_filldir(void *_cookie, const char *name, int nlen, |
29 | loff_t fpos, u64 ino, unsigned dtype); | 30 | loff_t fpos, u64 ino, unsigned dtype); |
@@ -581,7 +582,7 @@ static struct dentry *afs_lookup(struct inode *dir, struct dentry *dentry, | |||
581 | } | 582 | } |
582 | 583 | ||
583 | success: | 584 | success: |
584 | dentry->d_op = &afs_fs_dentry_operations; | 585 | d_set_d_op(dentry, &afs_fs_dentry_operations); |
585 | 586 | ||
586 | d_add(dentry, inode); | 587 | d_add(dentry, inode); |
587 | _leave(" = 0 { vn=%u u=%u } -> { ino=%lu v=%llu }", | 588 | _leave(" = 0 { vn=%u u=%u } -> { ino=%lu v=%llu }", |
@@ -607,6 +608,9 @@ static int afs_d_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
607 | void *dir_version; | 608 | void *dir_version; |
608 | int ret; | 609 | int ret; |
609 | 610 | ||
611 | if (nd->flags & LOOKUP_RCU) | ||
612 | return -ECHILD; | ||
613 | |||
610 | vnode = AFS_FS_I(dentry->d_inode); | 614 | vnode = AFS_FS_I(dentry->d_inode); |
611 | 615 | ||
612 | if (dentry->d_inode) | 616 | if (dentry->d_inode) |
@@ -730,7 +734,7 @@ out_bad: | |||
730 | * - called from dput() when d_count is going to 0. | 734 | * - called from dput() when d_count is going to 0. |
731 | * - return 1 to request dentry be unhashed, 0 otherwise | 735 | * - return 1 to request dentry be unhashed, 0 otherwise |
732 | */ | 736 | */ |
733 | static int afs_d_delete(struct dentry *dentry) | 737 | static int afs_d_delete(const struct dentry *dentry) |
734 | { | 738 | { |
735 | _enter("%s", dentry->d_name.name); | 739 | _enter("%s", dentry->d_name.name); |
736 | 740 | ||
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index cca8eef736f..6d4bc1c8ff6 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h | |||
@@ -624,7 +624,7 @@ extern void afs_clear_permits(struct afs_vnode *); | |||
624 | extern void afs_cache_permit(struct afs_vnode *, struct key *, long); | 624 | extern void afs_cache_permit(struct afs_vnode *, struct key *, long); |
625 | extern void afs_zap_permits(struct rcu_head *); | 625 | extern void afs_zap_permits(struct rcu_head *); |
626 | extern struct key *afs_request_key(struct afs_cell *); | 626 | extern struct key *afs_request_key(struct afs_cell *); |
627 | extern int afs_permission(struct inode *, int); | 627 | extern int afs_permission(struct inode *, int, unsigned int); |
628 | 628 | ||
629 | /* | 629 | /* |
630 | * server.c | 630 | * server.c |
diff --git a/fs/afs/security.c b/fs/afs/security.c index bb4ed144d0e..f44b9d35537 100644 --- a/fs/afs/security.c +++ b/fs/afs/security.c | |||
@@ -285,13 +285,16 @@ static int afs_check_permit(struct afs_vnode *vnode, struct key *key, | |||
285 | * - AFS ACLs are attached to directories only, and a file is controlled by its | 285 | * - AFS ACLs are attached to directories only, and a file is controlled by its |
286 | * parent directory's ACL | 286 | * parent directory's ACL |
287 | */ | 287 | */ |
288 | int afs_permission(struct inode *inode, int mask) | 288 | int afs_permission(struct inode *inode, int mask, unsigned int flags) |
289 | { | 289 | { |
290 | struct afs_vnode *vnode = AFS_FS_I(inode); | 290 | struct afs_vnode *vnode = AFS_FS_I(inode); |
291 | afs_access_t uninitialized_var(access); | 291 | afs_access_t uninitialized_var(access); |
292 | struct key *key; | 292 | struct key *key; |
293 | int ret; | 293 | int ret; |
294 | 294 | ||
295 | if (flags & IPERM_FLAG_RCU) | ||
296 | return -ECHILD; | ||
297 | |||
295 | _enter("{{%x:%u},%lx},%x,", | 298 | _enter("{{%x:%u},%lx},%x,", |
296 | vnode->fid.vid, vnode->fid.vnode, vnode->flags, mask); | 299 | vnode->fid.vid, vnode->fid.vnode, vnode->flags, mask); |
297 | 300 | ||
@@ -347,7 +350,7 @@ int afs_permission(struct inode *inode, int mask) | |||
347 | } | 350 | } |
348 | 351 | ||
349 | key_put(key); | 352 | key_put(key); |
350 | ret = generic_permission(inode, mask, NULL); | 353 | ret = generic_permission(inode, mask, flags, NULL); |
351 | _leave(" = %d", ret); | 354 | _leave(" = %d", ret); |
352 | return ret; | 355 | return ret; |
353 | 356 | ||
diff --git a/fs/afs/super.c b/fs/afs/super.c index 27201cffece..f901a9d7c11 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
@@ -498,6 +498,14 @@ static struct inode *afs_alloc_inode(struct super_block *sb) | |||
498 | return &vnode->vfs_inode; | 498 | return &vnode->vfs_inode; |
499 | } | 499 | } |
500 | 500 | ||
501 | static void afs_i_callback(struct rcu_head *head) | ||
502 | { | ||
503 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
504 | struct afs_vnode *vnode = AFS_FS_I(inode); | ||
505 | INIT_LIST_HEAD(&inode->i_dentry); | ||
506 | kmem_cache_free(afs_inode_cachep, vnode); | ||
507 | } | ||
508 | |||
501 | /* | 509 | /* |
502 | * destroy an AFS inode struct | 510 | * destroy an AFS inode struct |
503 | */ | 511 | */ |
@@ -511,7 +519,7 @@ static void afs_destroy_inode(struct inode *inode) | |||
511 | 519 | ||
512 | ASSERTCMP(vnode->server, ==, NULL); | 520 | ASSERTCMP(vnode->server, ==, NULL); |
513 | 521 | ||
514 | kmem_cache_free(afs_inode_cachep, vnode); | 522 | call_rcu(&inode->i_rcu, afs_i_callback); |
515 | atomic_dec(&afs_count_active_inodes); | 523 | atomic_dec(&afs_count_active_inodes); |
516 | } | 524 | } |
517 | 525 | ||