Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/9p/v9fs_vfs.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
extern struct file_system_type v9fs_fs_type;

extern const struct address_space_operations v9fs_addr_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 struct dentry_operations v9fs_dentry_operations;

extern struct dentry_operations v9fs_cached_dentry_operations;

fs/9p/vfs_file.c

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include "v9fs_vfs.h"

#include "fid.h"



static const struct file_operations v9fs_cached_file_operations;



/**

 * v9fs_file_open - open a file (or directory)

 * @inode: inode to be opened
@@ -245,7 +247,7 @@ v9fs_file_write(struct file *filp, const char __user * data, 
	return total;

}



const struct file_operations v9fs_cached_file_operations = {

static const struct file_operations v9fs_cached_file_operations = {

	.llseek = generic_file_llseek,

	.read = do_sync_read,

	.aio_read = generic_file_aio_read,