git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nfsd4: use helper for copying delegation filehandle
[safe/jmp/linux-2.6]
/
include
/
linux
/
nfsd
/
state.h
diff --git
a/include/linux/nfsd/state.h
b/include/linux/nfsd/state.h
index
b65b2a6
..
1130d53
100644
(file)
--- a/
include/linux/nfsd/state.h
+++ b/
include/linux/nfsd/state.h
@@
-66,8
+66,7
@@
struct nfs4_cb_recall {
u32 cbr_ident;
int cbr_trunc;
stateid_t cbr_stateid;
u32 cbr_ident;
int cbr_trunc;
stateid_t cbr_stateid;
- u32 cbr_fhlen;
- char cbr_fhval[NFS4_FHSIZE];
+ struct knfsd_fh cbr_fh;
struct nfs4_delegation *cbr_dp;
};
struct nfs4_delegation *cbr_dp;
};
@@
-86,8
+85,7
@@
struct nfs4_delegation {
};
#define dl_stateid dl_recall.cbr_stateid
};
#define dl_stateid dl_recall.cbr_stateid
-#define dl_fhlen dl_recall.cbr_fhlen
-#define dl_fhval dl_recall.cbr_fhval
+#define dl_fh dl_recall.cbr_fh
/* client delegation callback info */
struct nfs4_callback {
/* client delegation callback info */
struct nfs4_callback {