Commit 00db779b authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: make struct v9fs_cached_file_operations static
parents 9c88b702 d32b687e
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
extern struct file_system_type v9fs_fs_type; extern struct file_system_type v9fs_fs_type;
extern const struct address_space_operations v9fs_addr_operations; extern const struct address_space_operations v9fs_addr_operations;
extern const struct file_operations v9fs_file_operations; extern const struct file_operations v9fs_file_operations;
extern const struct file_operations v9fs_cached_file_operations;
extern const struct file_operations v9fs_dir_operations; extern const struct file_operations v9fs_dir_operations;
extern struct dentry_operations v9fs_dentry_operations; extern struct dentry_operations v9fs_dentry_operations;
extern struct dentry_operations v9fs_cached_dentry_operations; extern struct dentry_operations v9fs_cached_dentry_operations;
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include "v9fs_vfs.h" #include "v9fs_vfs.h"
#include "fid.h" #include "fid.h"
static const struct file_operations v9fs_cached_file_operations;
/** /**
* v9fs_file_open - open a file (or directory) * v9fs_file_open - open a file (or directory)
* @inode: inode to be opened * @inode: inode to be opened
...@@ -245,7 +247,7 @@ v9fs_file_write(struct file *filp, const char __user * data, ...@@ -245,7 +247,7 @@ v9fs_file_write(struct file *filp, const char __user * data,
return total; return total;
} }
const struct file_operations v9fs_cached_file_operations = { static const struct file_operations v9fs_cached_file_operations = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
.read = do_sync_read, .read = do_sync_read,
.aio_read = generic_file_aio_read, .aio_read = generic_file_aio_read,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment