Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFS: Cleanup to remove nfs_readdir_descriptor_t typedef

Browse Source 
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Tested-by: Benjamin Coddington <bcodding@redhat.com>
Tested-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Trond Myklebust 2020-11-03 07:42:04 -05:00
parent 6b75cf9e30
commit 6c981eff23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/nfs/dir.c
View File

@ -144,7 +144,7 @@ struct nfs_cache_array {
struct nfs_cache_array_entry array[]; struct nfs_cache_array_entry array[];
}; };
typedef struct nfs_readdir_descriptor { struct nfs_readdir_descriptor {
struct file *file; struct file *file;
struct page *page; struct page *page;
struct dir_context *ctx; struct dir_context *ctx;
@ -163,7 +163,7 @@ typedef struct nfs_readdir_descriptor {
signed char duped; signed char duped;
bool plus; bool plus;
bool eof; bool eof;
} nfs_readdir_descriptor_t; };
static void nfs_readdir_array_init(struct nfs_cache_array *array) static void nfs_readdir_array_init(struct nfs_cache_array *array)
{ {
@ -362,8 +362,8 @@ bool nfs_readdir_use_cookie(const struct file *filp)
return true; return true;
} }
static static int nfs_readdir_search_for_pos(struct nfs_cache_array *array,
int nfs_readdir_search_for_pos(struct nfs_cache_array *array, nfs_readdir_descriptor_t *desc) struct nfs_readdir_descriptor *desc)
{ {
loff_t diff = desc->ctx->pos - desc->current_index; loff_t diff = desc->ctx->pos - desc->current_index;
unsigned int index; unsigned int index;
@ -394,8 +394,8 @@ nfs_readdir_inode_mapping_valid(struct nfs_inode *nfsi)
return !test_bit(NFS_INO_INVALIDATING, &nfsi->flags); return !test_bit(NFS_INO_INVALIDATING, &nfsi->flags);
} }
static static int nfs_readdir_search_for_cookie(struct nfs_cache_array *array,
int nfs_readdir_search_for_cookie(struct nfs_cache_array *array, nfs_readdir_descriptor_t *desc) struct nfs_readdir_descriptor *desc)
{ {
int i; int i;
loff_t new_pos; loff_t new_pos;
@ -443,8 +443,7 @@ out:
return status; return status;
} }
static static int nfs_readdir_search_array(struct nfs_readdir_descriptor *desc)
int nfs_readdir_search_array(nfs_readdir_descriptor_t *desc)
{ {
struct nfs_cache_array *array; struct nfs_cache_array *array;
int status; int status;
@ -497,7 +496,7 @@ error:
return error; return error;
} }
static int xdr_decode(nfs_readdir_descriptor_t *desc, static int xdr_decode(struct nfs_readdir_descriptor *desc,
struct nfs_entry *entry, struct xdr_stream *xdr) struct nfs_entry *entry, struct xdr_stream *xdr)
{ {
struct inode *inode = file_inode(desc->file); struct inode *inode = file_inode(desc->file);
@ -757,8 +756,8 @@ out_freepages:
return NULL; return NULL;
} }
static static int nfs_readdir_xdr_to_array(struct nfs_readdir_descriptor *desc,
int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, struct inode *inode) struct page *page, struct inode *inode)
{ {
struct page **pages; struct page **pages;
struct nfs_entry *entry; struct nfs_entry *entry;
@ -838,8 +837,7 @@ nfs_readdir_page_get_cached(struct nfs_readdir_descriptor *desc)
* Returns 0 if desc->dir_cookie was found on page desc->page_index * Returns 0 if desc->dir_cookie was found on page desc->page_index
* and locks the page to prevent removal from the page cache. * and locks the page to prevent removal from the page cache.
*/ */
static static int find_and_lock_cache_page(struct nfs_readdir_descriptor *desc)
int find_and_lock_cache_page(nfs_readdir_descriptor_t *desc)
{ {
struct inode *inode = file_inode(desc->file); struct inode *inode = file_inode(desc->file);
struct nfs_inode *nfsi = NFS_I(inode); struct nfs_inode *nfsi = NFS_I(inode);
@ -864,8 +862,7 @@ error:
} }
/* Search for desc->dir_cookie from the beginning of the page cache */ /* Search for desc->dir_cookie from the beginning of the page cache */
static inline static int readdir_search_pagecache(struct nfs_readdir_descriptor *desc)
int readdir_search_pagecache(nfs_readdir_descriptor_t *desc)
{ {
int res; int res;
@ -930,8 +927,7 @@ static void nfs_do_filldir(struct nfs_readdir_descriptor *desc)
* we should already have a complete representation of the * we should already have a complete representation of the
* directory in the page cache by the time we get here. * directory in the page cache by the time we get here.
*/ */
static inline static int uncached_readdir(struct nfs_readdir_descriptor *desc)
int uncached_readdir(nfs_readdir_descriptor_t *desc)
{ {
struct page *page = NULL; struct page *page = NULL;
int status; int status;