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

Commit ceaec15d authored by Al Viro's avatar Al Viro
Browse files

9p: make v9fs_cache_inode_{get,put,set}_cookie empty inlines for !9P_CACHEFS 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d0e639c9

fs/9p/cache.h

+12 −0
Original line number Diff line number Diff line
@@ -101,6 +101,18 @@ static inline void v9fs_fscache_wait_on_page_write(struct inode *inode, 


#else /* CONFIG_9P_FSCACHE */



static inline void v9fs_cache_inode_get_cookie(struct inode *inode)

{

}



static inline void v9fs_cache_inode_put_cookie(struct inode *inode)

{

}



static inline void v9fs_cache_inode_set_cookie(struct inode *inode, struct file *file)

{

}



static inline int v9fs_fscache_release_page(struct page *page,

					    gfp_t gfp) {

	return 1;

fs/9p/vfs_file.c

+0 −2
Original line number Diff line number Diff line
@@ -105,10 +105,8 @@ int v9fs_file_open(struct inode *inode, struct file *file) 
		v9inode->writeback_fid = (void *) fid;

	}

	mutex_unlock(&v9inode->v_mutex);

#ifdef CONFIG_9P_FSCACHE

	if (v9ses->cache)

		v9fs_cache_inode_set_cookie(inode, file);

#endif

	return 0;

out_error:

	p9_client_clunk(file->private_data);

fs/9p/vfs_inode.c

+0 −6
Original line number Diff line number Diff line
@@ -448,9 +448,7 @@ void v9fs_evict_inode(struct inode *inode) 
	clear_inode(inode);

	filemap_fdatawrite(inode->i_mapping);



#ifdef CONFIG_9P_FSCACHE

	v9fs_cache_inode_put_cookie(inode);

#endif

	/* clunk the fid stashed in writeback_fid */

	if (v9inode->writeback_fid) {

		p9_client_clunk(v9inode->writeback_fid);
@@ -531,9 +529,7 @@ static struct inode *v9fs_qid_iget(struct super_block *sb, 
		goto error;



	v9fs_stat2inode(st, inode, sb);

#ifdef CONFIG_9P_FSCACHE

	v9fs_cache_inode_get_cookie(inode);

#endif

	unlock_new_inode(inode);

	return inode;

error:
@@ -905,10 +901,8 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry, 
		goto error;



	file->private_data = fid;

#ifdef CONFIG_9P_FSCACHE

	if (v9ses->cache)

		v9fs_cache_inode_set_cookie(dentry->d_inode, file);

#endif



	*opened |= FILE_CREATED;

out:

fs/9p/vfs_inode_dotl.c

+0 −4
Original line number Diff line number Diff line
@@ -141,9 +141,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb, 
		goto error;



	v9fs_stat2inode_dotl(st, inode);

#ifdef CONFIG_9P_FSCACHE

	v9fs_cache_inode_get_cookie(inode);

#endif

	retval = v9fs_get_acl(inode, fid);

	if (retval)

		goto error;
@@ -355,10 +353,8 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry, 
	if (err)

		goto err_clunk_old_fid;

	file->private_data = ofid;

#ifdef CONFIG_9P_FSCACHE

	if (v9ses->cache)

		v9fs_cache_inode_set_cookie(inode, file);

#endif

	*opened |= FILE_CREATED;

out:

	v9fs_put_acl(dacl, pacl);