diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2011-02-28 06:33:57 -0500 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@gmail.com> | 2011-03-15 10:57:37 -0400 |
commit | 3cf387d780944305839f5b27c51f225444ba4d27 (patch) | |
tree | ed4ef1d723ed3c7c280aadfcf397218004e49252 /fs/9p/vfs_inode.c | |
parent | 17311779ac3dcd06f8ef727a06969c439e116a20 (diff) |
fs/9p: Add fid to inode in cached mode
The fid attached to inode will be opened O_RDWR mode and is used
for dirty page writeback only.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs/9p/vfs_inode.c')
-rw-r--r-- | fs/9p/vfs_inode.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index 95f55011aca1..a0d65a398729 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c | |||
@@ -417,6 +417,11 @@ void v9fs_evict_inode(struct inode *inode) | |||
417 | #ifdef CONFIG_9P_FSCACHE | 417 | #ifdef CONFIG_9P_FSCACHE |
418 | v9fs_cache_inode_put_cookie(inode); | 418 | v9fs_cache_inode_put_cookie(inode); |
419 | #endif | 419 | #endif |
420 | /* clunk the fid stashed in inode->i_private */ | ||
421 | if (inode->i_private) { | ||
422 | p9_client_clunk((struct p9_fid *)inode->i_private); | ||
423 | inode->i_private = NULL; | ||
424 | } | ||
420 | } | 425 | } |
421 | 426 | ||
422 | struct inode * | 427 | struct inode * |
@@ -578,7 +583,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
578 | u32 perm; | 583 | u32 perm; |
579 | int flags; | 584 | int flags; |
580 | struct v9fs_session_info *v9ses; | 585 | struct v9fs_session_info *v9ses; |
581 | struct p9_fid *fid; | 586 | struct p9_fid *fid, *inode_fid; |
582 | struct file *filp; | 587 | struct file *filp; |
583 | 588 | ||
584 | err = 0; | 589 | err = 0; |
@@ -601,6 +606,21 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode, | |||
601 | 606 | ||
602 | /* if we are opening a file, assign the open fid to the file */ | 607 | /* if we are opening a file, assign the open fid to the file */ |
603 | if (nd && nd->flags & LOOKUP_OPEN) { | 608 | if (nd && nd->flags & LOOKUP_OPEN) { |
609 | if (v9ses->cache && !dentry->d_inode->i_private) { | ||
610 | /* | ||
611 | * clone a fid and add it to inode->i_private | ||
612 | * we do it during open time instead of | ||
613 | * page dirty time via write_begin/page_mkwrite | ||
614 | * because we want write after unlink usecase | ||
615 | * to work. | ||
616 | */ | ||
617 | inode_fid = v9fs_writeback_fid(dentry); | ||
618 | if (IS_ERR(inode_fid)) { | ||
619 | err = PTR_ERR(inode_fid); | ||
620 | goto error; | ||
621 | } | ||
622 | dentry->d_inode->i_private = (void *) inode_fid; | ||
623 | } | ||
604 | filp = lookup_instantiate_filp(nd, dentry, generic_file_open); | 624 | filp = lookup_instantiate_filp(nd, dentry, generic_file_open); |
605 | if (IS_ERR(filp)) { | 625 | if (IS_ERR(filp)) { |
606 | err = PTR_ERR(filp); | 626 | err = PTR_ERR(filp); |