aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/vfs_file.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/9p/vfs_file.c')
-rw-r--r--fs/9p/vfs_file.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 240c30674396..6a671000263f 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -44,9 +44,6 @@
44#include "fid.h" 44#include "fid.h"
45#include "cache.h" 45#include "cache.h"
46 46
47static const struct file_operations v9fs_cached_file_operations;
48static const struct file_operations v9fs_cached_file_operations_dotl;
49
50/** 47/**
51 * v9fs_file_open - open a file (or directory) 48 * v9fs_file_open - open a file (or directory)
52 * @inode: inode to be opened 49 * @inode: inode to be opened
@@ -89,19 +86,12 @@ int v9fs_file_open(struct inode *inode, struct file *file)
89 } 86 }
90 87
91 file->private_data = fid; 88 file->private_data = fid;
89#ifdef CONFIG_9P_FSCACHE
92 if ((fid->qid.version) && (v9ses->cache)) { 90 if ((fid->qid.version) && (v9ses->cache)) {
93 P9_DPRINTK(P9_DEBUG_VFS, "cached"); 91 P9_DPRINTK(P9_DEBUG_VFS, "cached");
94 /* enable cached file options */
95 if(file->f_op == &v9fs_file_operations)
96 file->f_op = &v9fs_cached_file_operations;
97 else if (file->f_op == &v9fs_file_operations_dotl)
98 file->f_op = &v9fs_cached_file_operations_dotl;
99
100#ifdef CONFIG_9P_FSCACHE
101 v9fs_cache_inode_set_cookie(inode, file); 92 v9fs_cache_inode_set_cookie(inode, file);
102#endif
103 } 93 }
104 94#endif
105 return 0; 95 return 0;
106} 96}
107 97
@@ -505,7 +495,7 @@ int v9fs_file_fsync_dotl(struct file *filp, int datasync)
505 return retval; 495 return retval;
506} 496}
507 497
508static const struct file_operations v9fs_cached_file_operations = { 498const struct file_operations v9fs_cached_file_operations = {
509 .llseek = generic_file_llseek, 499 .llseek = generic_file_llseek,
510 .read = do_sync_read, 500 .read = do_sync_read,
511 .aio_read = generic_file_aio_read, 501 .aio_read = generic_file_aio_read,
@@ -517,7 +507,7 @@ static const struct file_operations v9fs_cached_file_operations = {
517 .fsync = v9fs_file_fsync, 507 .fsync = v9fs_file_fsync,
518}; 508};
519 509
520static const struct file_operations v9fs_cached_file_operations_dotl = { 510const struct file_operations v9fs_cached_file_operations_dotl = {
521 .llseek = generic_file_llseek, 511 .llseek = generic_file_llseek,
522 .read = do_sync_read, 512 .read = do_sync_read,
523 .aio_read = generic_file_aio_read, 513 .aio_read = generic_file_aio_read,