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

Commit 29236f4e authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Eric Van Hensbergen
Browse files

fs/9p: set the cached file_operations struct during inode init 



With the old code we were not setting the file->f_op
with cached file operations during creat.

(format correction by jvrao@linux.vnet.ibm.com)

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent f735195d

fs/9p/v9fs_vfs.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

fs/9p/vfs_file.c

+4 −14
Original line number Diff line number Diff line
@@ -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
@@ -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;

}
@@ -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,
@@ -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,

fs/9p/vfs_inode.c

+9 −2
Original line number Diff line number Diff line
@@ -292,9 +292,16 @@ 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;

			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;

			if (v9ses->cache)

				inode->i_fop = &v9fs_cached_file_operations;

			else

				inode->i_fop = &v9fs_file_operations;

		}