Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235019
b: refs/heads/master
c: 29236f4
h: refs/heads/master
i:
  235017: 396c062
  235015: cc6e369
v: v3
  • Loading branch information
Aneesh Kumar K.V authored and Eric Van Hensbergen committed Mar 15, 2011
1 parent f825984 commit e3d33f9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f735195d51e10b2550097f7b0ac12219060e962b
refs/heads/master: 29236f4e18dde0c772968b6ce965d0365fe3fe4e
2 changes: 2 additions & 0 deletions trunk/fs/9p/v9fs_vfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ extern const struct file_operations v9fs_dir_operations;
extern const struct file_operations v9fs_dir_operations_dotl;
extern const struct dentry_operations v9fs_dentry_operations;
extern const struct dentry_operations v9fs_cached_dentry_operations;
extern const struct file_operations v9fs_cached_file_operations;
extern const struct file_operations v9fs_cached_file_operations_dotl;

#ifdef CONFIG_9P_FSCACHE
struct inode *v9fs_alloc_inode(struct super_block *sb);
Expand Down
18 changes: 4 additions & 14 deletions trunk/fs/9p/vfs_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@
#include "fid.h"
#include "cache.h"

static const struct file_operations v9fs_cached_file_operations;
static const struct file_operations v9fs_cached_file_operations_dotl;

/**
* v9fs_file_open - open a file (or directory)
* @inode: inode to be opened
Expand Down Expand Up @@ -89,19 +86,12 @@ int v9fs_file_open(struct inode *inode, struct file *file)
}

file->private_data = fid;
#ifdef CONFIG_9P_FSCACHE
if ((fid->qid.version) && (v9ses->cache)) {
P9_DPRINTK(P9_DEBUG_VFS, "cached");
/* enable cached file options */
if(file->f_op == &v9fs_file_operations)
file->f_op = &v9fs_cached_file_operations;
else if (file->f_op == &v9fs_file_operations_dotl)
file->f_op = &v9fs_cached_file_operations_dotl;

#ifdef CONFIG_9P_FSCACHE
v9fs_cache_inode_set_cookie(inode, file);
#endif
}

#endif
return 0;
}

Expand Down Expand Up @@ -505,7 +495,7 @@ int v9fs_file_fsync_dotl(struct file *filp, int datasync)
return retval;
}

static const struct file_operations v9fs_cached_file_operations = {
const struct file_operations v9fs_cached_file_operations = {
.llseek = generic_file_llseek,
.read = do_sync_read,
.aio_read = generic_file_aio_read,
Expand All @@ -517,7 +507,7 @@ static const struct file_operations v9fs_cached_file_operations = {
.fsync = v9fs_file_fsync,
};

static const struct file_operations v9fs_cached_file_operations_dotl = {
const struct file_operations v9fs_cached_file_operations_dotl = {
.llseek = generic_file_llseek,
.read = do_sync_read,
.aio_read = generic_file_aio_read,
Expand Down
11 changes: 9 additions & 2 deletions trunk/fs/9p/vfs_inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,17 @@ struct inode *v9fs_get_inode(struct super_block *sb, int mode)
case S_IFREG:
if (v9fs_proto_dotl(v9ses)) {
inode->i_op = &v9fs_file_inode_operations_dotl;
inode->i_fop = &v9fs_file_operations_dotl;
if (v9ses->cache)
inode->i_fop =
&v9fs_cached_file_operations_dotl;
else
inode->i_fop = &v9fs_file_operations_dotl;
} else {
inode->i_op = &v9fs_file_inode_operations;
inode->i_fop = &v9fs_file_operations;
if (v9ses->cache)
inode->i_fop = &v9fs_cached_file_operations;
else
inode->i_fop = &v9fs_file_operations;
}

break;
Expand Down

0 comments on commit e3d33f9

Please sign in to comment.