Commit 32dfc756 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] Fix compile errors in NFSv4 server

parent 9b1ea0b2
...@@ -703,7 +703,7 @@ alloc_init_file(unsigned int hashval, struct inode *ino) { ...@@ -703,7 +703,7 @@ alloc_init_file(unsigned int hashval, struct inode *ino) {
INIT_LIST_HEAD(&fp->fi_hash); INIT_LIST_HEAD(&fp->fi_hash);
INIT_LIST_HEAD(&fp->fi_perfile); INIT_LIST_HEAD(&fp->fi_perfile);
list_add(&fp->fi_hash, &file_hashtbl[hashval]); list_add(&fp->fi_hash, &file_hashtbl[hashval]);
fp->fi_ino = igrab(ino); fp->fi_inode = igrab(ino);
fp->fi_id = current_fileid++; fp->fi_id = current_fileid++;
alloc_file++; alloc_file++;
return fp; return fp;
...@@ -841,7 +841,7 @@ release_file(struct nfs4_file *fp) ...@@ -841,7 +841,7 @@ release_file(struct nfs4_file *fp)
{ {
free_file++; free_file++;
list_del_init(&fp->fi_hash); list_del_init(&fp->fi_hash);
iput(fp->ino); iput(fp->fi_inode);
kfree(fp); kfree(fp);
} }
...@@ -913,13 +913,13 @@ verify_clientid(struct nfs4_client **client, clientid_t *clid) { ...@@ -913,13 +913,13 @@ verify_clientid(struct nfs4_client **client, clientid_t *clid) {
/* search file_hashtbl[] for file */ /* search file_hashtbl[] for file */
static int static int
find_file(unsigned int hashval, nfs4_ino_desc_t *ino, struct nfs4_file **fp) { find_file(unsigned int hashval, struct inode *ino, struct nfs4_file **fp) {
struct list_head *pos, *next; struct list_head *pos, *next;
struct nfs4_file *local = NULL; struct nfs4_file *local = NULL;
list_for_each_safe(pos, next, &file_hashtbl[hashval]) { list_for_each_safe(pos, next, &file_hashtbl[hashval]) {
local = list_entry(pos, struct nfs4_file, fi_hash); local = list_entry(pos, struct nfs4_file, fi_hash);
if(!memcmp(&local->fi_ino, ino, sizeof(nfs4_ino_desc_t))) { if (local->fi_inode == ino) {
*fp = local; *fp = local;
return(1); return(1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment