GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 22:21:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfsd4: eliminate struct nfs4_cb_recall

Browse source 
The nfs4_cb_recall struct is used only in nfs4_delegation, so its
pointer to the containing delegation is unnecessary--we could just use
container_of().

But there's no real reason to have this a separate struct at all--just
move these fields to nfs4_delegation.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2009-05-01 19:50:00 -04:00
parent c237dc0303
commit b53d40c507
3 changed files with 18 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/linux/nfsd/state.h
View file

@ -61,15 +61,6 @@ typedef struct {
#define si_stateownerid si_opaque.so_stateownerid
#define si_fileid si_opaque.so_fileid
struct nfs4_cb_recall {
u32 cbr_ident;
int cbr_trunc;
stateid_t cbr_stateid;
struct knfsd_fh cbr_fh;
struct nfs4_delegation *cbr_dp;
};
struct nfs4_delegation {
struct list_head dl_perfile;
struct list_head dl_perclnt;
@ -81,12 +72,13 @@ struct nfs4_delegation {
struct file *dl_vfs_file;
u32 dl_type;
time_t dl_time;
struct nfs4_cb_recall dl_recall;
/* For recall: */
u32 dl_ident;
int dl_trunc;
stateid_t dl_stateid;
struct knfsd_fh dl_fh;
};
#define dl_stateid dl_recall.cbr_stateid
#define dl_fh dl_recall.cbr_fh
/* client delegation callback info */
struct nfs4_cb_conn {
/* SETCLIENTID info */