hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-09-17 08:07:11 -04:00
parent d0e639c9e0
commit ceaec15d49
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/9p/cache.h
View File

@ -101,6 +101,18 @@ static inline void v9fs_fscache_wait_on_page_write(struct inode *inode,
#else /* CONFIG_9P_FSCACHE */ #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, static inline int v9fs_fscache_release_page(struct page *page,
gfp_t gfp) { gfp_t gfp) {
return 1; return 1;

2
fs/9p/vfs_file.c
View File

@ -105,10 +105,8 @@ int v9fs_file_open(struct inode *inode, struct file *file)
v9inode->writeback_fid = (void *) fid; v9inode->writeback_fid = (void *) fid;
} }
mutex_unlock(&v9inode->v_mutex); mutex_unlock(&v9inode->v_mutex);
#ifdef CONFIG_9P_FSCACHE
if (v9ses->cache) if (v9ses->cache)
v9fs_cache_inode_set_cookie(inode, file); v9fs_cache_inode_set_cookie(inode, file);
#endif
return 0; return 0;
out_error: out_error:
p9_client_clunk(file->private_data); p9_client_clunk(file->private_data);

6
fs/9p/vfs_inode.c
View File

@ -448,9 +448,7 @@ void v9fs_evict_inode(struct inode *inode)
clear_inode(inode); clear_inode(inode);
filemap_fdatawrite(inode->i_mapping); filemap_fdatawrite(inode->i_mapping);
#ifdef CONFIG_9P_FSCACHE
v9fs_cache_inode_put_cookie(inode); v9fs_cache_inode_put_cookie(inode);
#endif
/* clunk the fid stashed in writeback_fid */ /* clunk the fid stashed in writeback_fid */
if (v9inode->writeback_fid) { if (v9inode->writeback_fid) {
p9_client_clunk(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; goto error;
v9fs_stat2inode(st, inode, sb); v9fs_stat2inode(st, inode, sb);
#ifdef CONFIG_9P_FSCACHE
v9fs_cache_inode_get_cookie(inode); v9fs_cache_inode_get_cookie(inode);
#endif
unlock_new_inode(inode); unlock_new_inode(inode);
return inode; return inode;
error: error:
@ -905,10 +901,8 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
goto error; goto error;
file->private_data = fid; file->private_data = fid;
#ifdef CONFIG_9P_FSCACHE
if (v9ses->cache) if (v9ses->cache)
v9fs_cache_inode_set_cookie(dentry->d_inode, file); v9fs_cache_inode_set_cookie(dentry->d_inode, file);
#endif
*opened |= FILE_CREATED; *opened |= FILE_CREATED;
out: out:

4
fs/9p/vfs_inode_dotl.c
View File

@ -141,9 +141,7 @@ static struct inode *v9fs_qid_iget_dotl(struct super_block *sb,
goto error; goto error;
v9fs_stat2inode_dotl(st, inode); v9fs_stat2inode_dotl(st, inode);
#ifdef CONFIG_9P_FSCACHE
v9fs_cache_inode_get_cookie(inode); v9fs_cache_inode_get_cookie(inode);
#endif
retval = v9fs_get_acl(inode, fid); retval = v9fs_get_acl(inode, fid);
if (retval) if (retval)
goto error; goto error;
@ -355,10 +353,8 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
if (err) if (err)
goto err_clunk_old_fid; goto err_clunk_old_fid;
file->private_data = ofid; file->private_data = ofid;
#ifdef CONFIG_9P_FSCACHE
if (v9ses->cache) if (v9ses->cache)
v9fs_cache_inode_set_cookie(inode, file); v9fs_cache_inode_set_cookie(inode, file);
#endif
*opened |= FILE_CREATED; *opened |= FILE_CREATED;
out: out:
v9fs_put_acl(dacl, pacl); v9fs_put_acl(dacl, pacl);