From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: v9fs-developer@lists.sourceforge.net
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [RFC PATCH -V2 06/17] fs/9p: Add fid to inode in cached mode
Date: Sat, 5 Feb 2011 23:16:34 +0530 [thread overview]
Message-ID: <1296928005-9529-7-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1296928005-9529-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>
The fid attached to inode will be opened O_RDWR mode and is used
for dirty page writeback only.
FIXME!!: Should we make the fid owned by uid = 0
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
fs/9p/vfs_file.c | 31 +++++++++++++++++++++++++++++++
fs/9p/vfs_inode.c | 34 +++++++++++++++++++++++++++++++++-
fs/9p/vfs_inode_dotl.c | 30 ++++++++++++++++++++++++++++--
3 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index ecdd512..0f62b26 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -86,11 +86,42 @@ int v9fs_file_open(struct inode *inode, struct file *file)
}
file->private_data = fid;
+ /*
+ * In cached mode we need to attach a fid to inode. The fid
+ * attached to inode will only be used to write back the
+ * dirty pages. We always request for the open fid in read-write
+ * mode so that a partial page write which result in page
+ * read can work.
+ */
+ if (v9ses->cache && !inode->i_private) {
+ /*
+ * clone a fid and add it to inode->i_private
+ * we do it during open time instead of
+ * page dirty time via write_begin/page_mkwrite
+ * because we want write after unlink usecase
+ * to work.
+ */
+ fid = v9fs_fid_clone(file->f_path.dentry);
+ if (IS_ERR(fid)) {
+ err = PTR_ERR(fid);
+ goto out_error;
+ }
+ err = p9_client_open(fid, O_RDWR);
+ if (err < 0) {
+ p9_client_clunk(fid);
+ goto out_error;
+ }
+ inode->i_private = (void *) fid;
+ }
#ifdef CONFIG_9P_FSCACHE
if (v9ses->cache)
v9fs_cache_inode_set_cookie(inode, file);
#endif
return 0;
+out_error:
+ p9_client_clunk(file->private_data);
+ file->private_data = 0;
+ return err;
}
/**
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index ce56571..ecd2c6f 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -416,6 +416,11 @@ void v9fs_evict_inode(struct inode *inode)
#ifdef CONFIG_9P_FSCACHE
v9fs_cache_inode_put_cookie(inode);
#endif
+ /* clunk the fid stashed in inode->i_private */
+ if (inode->i_private) {
+ p9_client_clunk((struct p9_fid *)inode->i_private);
+ inode->i_private = 0;
+ }
}
struct inode *
@@ -577,7 +582,7 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
u32 perm;
int flags;
struct v9fs_session_info *v9ses;
- struct p9_fid *fid;
+ struct p9_fid *fid, *inode_fid;
struct file *filp;
err = 0;
@@ -600,6 +605,33 @@ v9fs_vfs_create(struct inode *dir, struct dentry *dentry, int mode,
/* if we are opening a file, assign the open fid to the file */
if (nd && nd->flags & LOOKUP_OPEN) {
+ /*
+ * In cached mode we need to attach a fid to inode. The fid
+ * attached to inode will only be used to write back the
+ * dirty pages. We always request for the open fid in read-write
+ * mode so that a partial page write which result in page
+ * read can work.
+ */
+ if (v9ses->cache && !dentry->d_inode->i_private) {
+ /*
+ * clone a fid and add it to inode->i_private
+ * we do it during open time instead of
+ * page dirty time via write_begin/page_mkwrite
+ * because we want write after unlink usecase
+ * to work.
+ */
+ inode_fid = v9fs_fid_clone(dentry);
+ if (IS_ERR(inode_fid)) {
+ err = PTR_ERR(inode_fid);
+ goto error;
+ }
+ err = p9_client_open(inode_fid, O_RDWR);
+ if (err < 0) {
+ p9_client_clunk(inode_fid);
+ goto error;
+ }
+ dentry->d_inode->i_private = (void *) inode_fid;
+ }
filp = lookup_instantiate_filp(nd, dentry, generic_file_open);
if (IS_ERR(filp)) {
err = PTR_ERR(filp);
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index 265f583..d5aa986 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -142,7 +142,7 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
mode_t mode;
struct v9fs_session_info *v9ses;
struct p9_fid *fid = NULL;
- struct p9_fid *dfid, *ofid;
+ struct p9_fid *dfid, *ofid, *inode_fid;
struct file *filp;
struct p9_qid qid;
struct inode *inode;
@@ -218,7 +218,33 @@ v9fs_vfs_create_dotl(struct inode *dir, struct dentry *dentry, int omode,
/* Now set the ACL based on the default value */
v9fs_set_create_acl(dentry, dacl, pacl);
-
+ /*
+ * In cached mode we need to attach a fid to inode. The fid
+ * attached to inode will only be used to write back the
+ * dirty pages. We always request for the open fid in read-write
+ * mode so that a partial page write which result in page
+ * read can work.
+ */
+ if (v9ses->cache && !inode->i_private) {
+ /*
+ * clone a fid and add it to inode->i_private
+ * we do it during open time instead of
+ * page dirty time via write_begin/page_mkwrite
+ * because we want write after unlink usecase
+ * to work.
+ */
+ inode_fid = v9fs_fid_clone(dentry);
+ if (IS_ERR(inode_fid)) {
+ err = PTR_ERR(inode_fid);
+ goto error;
+ }
+ err = p9_client_open(inode_fid, O_RDWR);
+ if (err < 0) {
+ p9_client_clunk(inode_fid);
+ goto error;
+ }
+ inode->i_private = (void *) inode_fid;
+ }
/* Since we are opening a file, assign the open fid to the file */
filp = lookup_instantiate_filp(nd, dentry, generic_file_open);
if (IS_ERR(filp)) {
--
1.7.1
next prev parent reply other threads:[~2011-02-05 17:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-05 17:46 [RFC PATCH -V2 0/17] Buffered write and writeable mmap support for 9P Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 01/17] fs/9p: set the cached file_operations struct during inode init Aneesh Kumar K.V
2011-02-07 15:02 ` [V9fs-developer] " Eric Van Hensbergen
2011-02-08 8:47 ` Aneesh Kumar K. V
2011-02-05 17:46 ` [RFC PATCH -V2 02/17] fs/9p: set fs cache cookie in create path also Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 03/17] fs/9p: increment inode->i_count in cached mode Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 04/17] fs/9p: [fscache] wait for page write " Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 05/17] fs/9p: Add read write helper function Aneesh Kumar K.V
2011-02-05 17:46 ` Aneesh Kumar K.V [this message]
2011-02-07 15:30 ` [V9fs-developer] [RFC PATCH -V2 06/17] fs/9p: Add fid to inode in cached mode Eric Van Hensbergen
2011-02-05 17:46 ` [RFC PATCH -V2 07/17] fs/9p: Add buffered write support for v9fs Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 08/17] fs/9p: Clarify cached dentry delete operation Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 09/17] fs/9p: Mark file system with MS_SYNCHRONOUS only if it is not cached mode Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 10/17] net/9p: Implement syncfs 9P operation Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 11/17] fs/9p: Implement syncfs call back for 9Pfs Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 12/17] fs/9p: We need not writeback dirty pages during close Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 13/17] fs/9p: Add inode hashing Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 14/17] fs/9p: Don't set stat.st_blocks based on nrpages Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 15/17] fs/9p: Add v9fs_inode Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 16/17] fs/9p: Move writeback fid to v9fs_inode Aneesh Kumar K.V
2011-02-05 17:46 ` [RFC PATCH -V2 17/17] fs/9p: set default readahead pages in cached mode Aneesh Kumar K.V
2011-02-05 18:03 ` [RFC PATCH -V2 0/17] Buffered write and writeable mmap support for 9P Aneesh Kumar K. V
2011-02-07 14:58 ` [V9fs-developer] " Eric Van Hensbergen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1296928005-9529-7-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=v9fs-developer@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).