aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/nfsd/nfs4state.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 927d2007d5ab..f03a4180fa11 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -65,14 +65,6 @@ static u32 nfs4_init;
65stateid_t zerostateid; /* bits all 0 */ 65stateid_t zerostateid; /* bits all 0 */
66stateid_t onestateid; /* bits all 1 */ 66stateid_t onestateid; /* bits all 1 */
67 67
68/* debug counters */
69u32 list_add_perfile = 0;
70u32 list_del_perfile = 0;
71u32 add_perclient = 0;
72u32 del_perclient = 0;
73u32 vfsopen = 0;
74u32 vfsclose = 0;
75
76/* forward declarations */ 68/* forward declarations */
77struct nfs4_stateid * find_stateid(stateid_t *stid, int flags); 69struct nfs4_stateid * find_stateid(stateid_t *stid, int flags);
78static struct nfs4_delegation * find_delegation_stateid(struct inode *ino, stateid_t *stid); 70static struct nfs4_delegation * find_delegation_stateid(struct inode *ino, stateid_t *stid);
@@ -192,7 +184,6 @@ nfs4_close_delegation(struct nfs4_delegation *dp)
192 if (dp->dl_flock) 184 if (dp->dl_flock)
193 setlease(filp, F_UNLCK, &dp->dl_flock); 185 setlease(filp, F_UNLCK, &dp->dl_flock);
194 nfsd_close(filp); 186 nfsd_close(filp);
195 vfsclose++;
196} 187}
197 188
198/* Called under the state lock. */ 189/* Called under the state lock. */
@@ -1083,7 +1074,6 @@ alloc_init_open_stateowner(unsigned int strhashval, struct nfs4_client *clp, str
1083 list_add(&sop->so_idhash, &ownerid_hashtbl[idhashval]); 1074 list_add(&sop->so_idhash, &ownerid_hashtbl[idhashval]);
1084 list_add(&sop->so_strhash, &ownerstr_hashtbl[strhashval]); 1075 list_add(&sop->so_strhash, &ownerstr_hashtbl[strhashval]);
1085 list_add(&sop->so_perclient, &clp->cl_perclient); 1076 list_add(&sop->so_perclient, &clp->cl_perclient);
1086 add_perclient++;
1087 sop->so_is_open_owner = 1; 1077 sop->so_is_open_owner = 1;
1088 sop->so_id = current_ownerid++; 1078 sop->so_id = current_ownerid++;
1089 sop->so_client = clp; 1079 sop->so_client = clp;
@@ -1117,10 +1107,8 @@ unhash_stateowner(struct nfs4_stateowner *sop)
1117 1107
1118 list_del(&sop->so_idhash); 1108 list_del(&sop->so_idhash);
1119 list_del(&sop->so_strhash); 1109 list_del(&sop->so_strhash);
1120 if (sop->so_is_open_owner) { 1110 if (sop->so_is_open_owner)
1121 list_del(&sop->so_perclient); 1111 list_del(&sop->so_perclient);
1122 del_perclient++;
1123 }
1124 list_del(&sop->so_perlockowner); 1112 list_del(&sop->so_perlockowner);
1125 while (!list_empty(&sop->so_perfilestate)) { 1113 while (!list_empty(&sop->so_perfilestate)) {
1126 stp = list_entry(sop->so_perfilestate.next, 1114 stp = list_entry(sop->so_perfilestate.next,
@@ -1151,7 +1139,6 @@ init_stateid(struct nfs4_stateid *stp, struct nfs4_file *fp, struct nfsd4_open *
1151 INIT_LIST_HEAD(&stp->st_perfile); 1139 INIT_LIST_HEAD(&stp->st_perfile);
1152 list_add(&stp->st_hash, &stateid_hashtbl[hashval]); 1140 list_add(&stp->st_hash, &stateid_hashtbl[hashval]);
1153 list_add(&stp->st_perfilestate, &sop->so_perfilestate); 1141 list_add(&stp->st_perfilestate, &sop->so_perfilestate);
1154 list_add_perfile++;
1155 list_add(&stp->st_perfile, &fp->fi_perfile); 1142 list_add(&stp->st_perfile, &fp->fi_perfile);
1156 stp->st_stateowner = sop; 1143 stp->st_stateowner = sop;
1157 stp->st_file = fp; 1144 stp->st_file = fp;
@@ -1171,14 +1158,12 @@ release_stateid(struct nfs4_stateid *stp, int flags)
1171 struct file *filp = stp->st_vfs_file; 1158 struct file *filp = stp->st_vfs_file;
1172 1159
1173 list_del(&stp->st_hash); 1160 list_del(&stp->st_hash);
1174 list_del_perfile++;
1175 list_del(&stp->st_perfile); 1161 list_del(&stp->st_perfile);
1176 list_del(&stp->st_perfilestate); 1162 list_del(&stp->st_perfilestate);
1177 if (flags & OPEN_STATE) { 1163 if (flags & OPEN_STATE) {
1178 release_stateid_lockowners(stp); 1164 release_stateid_lockowners(stp);
1179 stp->st_vfs_file = NULL; 1165 stp->st_vfs_file = NULL;
1180 nfsd_close(filp); 1166 nfsd_close(filp);
1181 vfsclose++;
1182 } else if (flags & LOCK_STATE) 1167 } else if (flags & LOCK_STATE)
1183 locks_remove_posix(filp, (fl_owner_t) stp->st_stateowner); 1168 locks_remove_posix(filp, (fl_owner_t) stp->st_stateowner);
1184 kmem_cache_free(stateid_slab, stp); 1169 kmem_cache_free(stateid_slab, stp);
@@ -1645,7 +1630,6 @@ nfs4_new_open(struct svc_rqst *rqstp, struct nfs4_stateid **stpp,
1645 return status; 1630 return status;
1646 } 1631 }
1647 } 1632 }
1648 vfsopen++;
1649 *stpp = stp; 1633 *stpp = stp;
1650 return 0; 1634 return 0;
1651} 1635}
@@ -2650,7 +2634,6 @@ alloc_init_lock_stateid(struct nfs4_stateowner *sop, struct nfs4_file *fp, struc
2650 INIT_LIST_HEAD(&stp->st_perlockowner); /* not used */ 2634 INIT_LIST_HEAD(&stp->st_perlockowner); /* not used */
2651 list_add(&stp->st_hash, &lockstateid_hashtbl[hashval]); 2635 list_add(&stp->st_hash, &lockstateid_hashtbl[hashval]);
2652 list_add(&stp->st_perfile, &fp->fi_perfile); 2636 list_add(&stp->st_perfile, &fp->fi_perfile);
2653 list_add_perfile++;
2654 list_add(&stp->st_perfilestate, &sop->so_perfilestate); 2637 list_add(&stp->st_perfilestate, &sop->so_perfilestate);
2655 stp->st_stateowner = sop; 2638 stp->st_stateowner = sop;
2656 stp->st_file = fp; 2639 stp->st_file = fp;
@@ -3308,12 +3291,6 @@ __nfs4_state_shutdown(void)
3308 cancel_delayed_work(&laundromat_work); 3291 cancel_delayed_work(&laundromat_work);
3309 flush_scheduled_work(); 3292 flush_scheduled_work();
3310 nfs4_init = 0; 3293 nfs4_init = 0;
3311 dprintk("NFSD: list_add_perfile %d list_del_perfile %d\n",
3312 list_add_perfile, list_del_perfile);
3313 dprintk("NFSD: add_perclient %d del_perclient %d\n",
3314 add_perclient, del_perclient);
3315 dprintk("NFSD: vfsopen %d vfsclose %d\n",
3316 vfsopen, vfsclose);
3317} 3294}
3318 3295
3319void 3296void