microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

nfsd4: common stateid-printing code 

There's a problem with how I'm formatting stateids.  Before I fix it,
I'd like to move the stateid formatting into a common helper.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2020-04-13 21:37:19 -04:00
Родитель 0e698dfa28
Коммит ace7ade4f5
1 изменённых файлов: 17 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
fs/nfsd/nfs4state.c
Просмотреть файл

@ -2422,6 +2422,11 @@ static void nfs4_show_owner(struct seq_file *s, struct nfs4_stateowner *oo)
seq_quote_mem(s, oo->so_owner.data, oo->so_owner.len); seq_quote_mem(s, oo->so_owner.data, oo->so_owner.len);
} }
static void nfs4_show_stateid(struct seq_file *s, stateid_t *stid)
{
seq_printf(s, "0x%16phN", stid);
}
static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st) static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)
{ {
struct nfs4_ol_stateid *ols; struct nfs4_ol_stateid *ols;
@ -2437,7 +2442,9 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st)
nf = st->sc_file; nf = st->sc_file;
file = find_any_file(nf); file = find_any_file(nf);
seq_printf(s, "- 0x%16phN: { type: open, ", &st->sc_stateid); seq_printf(s, "- ");
nfs4_show_stateid(s, &st->sc_stateid);
seq_printf(s, ": { type: open, ");
access = bmap_to_share_mode(ols->st_access_bmap); access = bmap_to_share_mode(ols->st_access_bmap);
deny = bmap_to_share_mode(ols->st_deny_bmap); deny = bmap_to_share_mode(ols->st_deny_bmap);
@ -2470,7 +2477,9 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st)
nf = st->sc_file; nf = st->sc_file;
file = find_any_file(nf); file = find_any_file(nf);
seq_printf(s, "- 0x%16phN: { type: lock, ", &st->sc_stateid); seq_printf(s, "- ");
nfs4_show_stateid(s, &st->sc_stateid);
seq_printf(s, ": { type: lock, ");
/* /*
* Note: a lock stateid isn't really the same thing as a lock, * Note: a lock stateid isn't really the same thing as a lock,
@ -2499,7 +2508,9 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st)
nf = st->sc_file; nf = st->sc_file;
file = nf->fi_deleg_file; file = nf->fi_deleg_file;
seq_printf(s, "- 0x%16phN: { type: deleg, ", &st->sc_stateid); seq_printf(s, "- ");
nfs4_show_stateid(s, &st->sc_stateid);
seq_printf(s, ": { type: deleg, ");
/* Kinda dead code as long as we only support read delegs: */ /* Kinda dead code as long as we only support read delegs: */
seq_printf(s, "access: %s, ", seq_printf(s, "access: %s, ",
@ -2521,7 +2532,9 @@ static int nfs4_show_layout(struct seq_file *s, struct nfs4_stid *st)
ls = container_of(st, struct nfs4_layout_stateid, ls_stid); ls = container_of(st, struct nfs4_layout_stateid, ls_stid);
file = ls->ls_file; file = ls->ls_file;
seq_printf(s, "- 0x%16phN: { type: layout, ", &st->sc_stateid); seq_printf(s, "- ");
nfs4_show_stateid(s, &st->sc_stateid);
seq_printf(s, ": { type: layout, ");
/* XXX: What else would be useful? */ /* XXX: What else would be useful? */