Skip to content

Commit 45ba66c

Browse files
jtlaytonchucklever
authored andcommitted
nfsd: eliminate find_deleg_file_locked
We really don't need an accessor function here. Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent fcb5309 commit 45ba66c

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

fs/nfsd/nfs4state.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -686,15 +686,6 @@ static struct nfsd_file *find_any_file_locked(struct nfs4_file *f)
686686
return NULL;
687687
}
688688

689-
static struct nfsd_file *find_deleg_file_locked(struct nfs4_file *f)
690-
{
691-
lockdep_assert_held(&f->fi_lock);
692-
693-
if (f->fi_deleg_file)
694-
return f->fi_deleg_file;
695-
return NULL;
696-
}
697-
698689
static atomic_long_t num_delegations;
699690
unsigned long max_delegations;
700691

@@ -2703,7 +2694,7 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)
27032694
ds = delegstateid(st);
27042695
nf = st->sc_file;
27052696
spin_lock(&nf->fi_lock);
2706-
file = find_deleg_file_locked(nf);
2697+
file = nf->fi_deleg_file;
27072698
if (!file)
27082699
goto out;
27092700

0 commit comments

Comments
 (0)