diff options
author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /include/linux/nfs_xdr.h | |
parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'include/linux/nfs_xdr.h')
-rw-r--r-- | include/linux/nfs_xdr.h | 171 |
1 files changed, 171 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index b89c34e40bc2..62f63fb0c4c8 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
@@ -145,6 +145,44 @@ struct nfs4_change_info { | |||
145 | }; | 145 | }; |
146 | 146 | ||
147 | struct nfs_seqid; | 147 | struct nfs_seqid; |
148 | |||
149 | /* nfs41 sessions channel attributes */ | ||
150 | struct nfs4_channel_attrs { | ||
151 | u32 headerpadsz; | ||
152 | u32 max_rqst_sz; | ||
153 | u32 max_resp_sz; | ||
154 | u32 max_resp_sz_cached; | ||
155 | u32 max_ops; | ||
156 | u32 max_reqs; | ||
157 | }; | ||
158 | |||
159 | /* nfs41 sessions slot seqid */ | ||
160 | struct nfs4_slot { | ||
161 | u32 seq_nr; | ||
162 | }; | ||
163 | |||
164 | struct nfs4_sequence_args { | ||
165 | struct nfs4_session *sa_session; | ||
166 | u8 sa_slotid; | ||
167 | u8 sa_cache_this; | ||
168 | }; | ||
169 | |||
170 | struct nfs4_sequence_res { | ||
171 | struct nfs4_session *sr_session; | ||
172 | u8 sr_slotid; /* slot used to send request */ | ||
173 | unsigned long sr_renewal_time; | ||
174 | int sr_status; /* sequence operation status */ | ||
175 | }; | ||
176 | |||
177 | struct nfs4_get_lease_time_args { | ||
178 | struct nfs4_sequence_args la_seq_args; | ||
179 | }; | ||
180 | |||
181 | struct nfs4_get_lease_time_res { | ||
182 | struct nfs_fsinfo *lr_fsinfo; | ||
183 | struct nfs4_sequence_res lr_seq_res; | ||
184 | }; | ||
185 | |||
148 | /* | 186 | /* |
149 | * Arguments to the open call. | 187 | * Arguments to the open call. |
150 | */ | 188 | */ |
@@ -165,6 +203,7 @@ struct nfs_openargs { | |||
165 | const struct nfs_server *server; /* Needed for ID mapping */ | 203 | const struct nfs_server *server; /* Needed for ID mapping */ |
166 | const u32 * bitmask; | 204 | const u32 * bitmask; |
167 | __u32 claim; | 205 | __u32 claim; |
206 | struct nfs4_sequence_args seq_args; | ||
168 | }; | 207 | }; |
169 | 208 | ||
170 | struct nfs_openres { | 209 | struct nfs_openres { |
@@ -181,6 +220,7 @@ struct nfs_openres { | |||
181 | __u32 do_recall; | 220 | __u32 do_recall; |
182 | __u64 maxsize; | 221 | __u64 maxsize; |
183 | __u32 attrset[NFS4_BITMAP_SIZE]; | 222 | __u32 attrset[NFS4_BITMAP_SIZE]; |
223 | struct nfs4_sequence_res seq_res; | ||
184 | }; | 224 | }; |
185 | 225 | ||
186 | /* | 226 | /* |
@@ -206,6 +246,7 @@ struct nfs_closeargs { | |||
206 | struct nfs_seqid * seqid; | 246 | struct nfs_seqid * seqid; |
207 | fmode_t fmode; | 247 | fmode_t fmode; |
208 | const u32 * bitmask; | 248 | const u32 * bitmask; |
249 | struct nfs4_sequence_args seq_args; | ||
209 | }; | 250 | }; |
210 | 251 | ||
211 | struct nfs_closeres { | 252 | struct nfs_closeres { |
@@ -213,6 +254,7 @@ struct nfs_closeres { | |||
213 | struct nfs_fattr * fattr; | 254 | struct nfs_fattr * fattr; |
214 | struct nfs_seqid * seqid; | 255 | struct nfs_seqid * seqid; |
215 | const struct nfs_server *server; | 256 | const struct nfs_server *server; |
257 | struct nfs4_sequence_res seq_res; | ||
216 | }; | 258 | }; |
217 | /* | 259 | /* |
218 | * * Arguments to the lock,lockt, and locku call. | 260 | * * Arguments to the lock,lockt, and locku call. |
@@ -233,12 +275,14 @@ struct nfs_lock_args { | |||
233 | unsigned char block : 1; | 275 | unsigned char block : 1; |
234 | unsigned char reclaim : 1; | 276 | unsigned char reclaim : 1; |
235 | unsigned char new_lock_owner : 1; | 277 | unsigned char new_lock_owner : 1; |
278 | struct nfs4_sequence_args seq_args; | ||
236 | }; | 279 | }; |
237 | 280 | ||
238 | struct nfs_lock_res { | 281 | struct nfs_lock_res { |
239 | nfs4_stateid stateid; | 282 | nfs4_stateid stateid; |
240 | struct nfs_seqid * lock_seqid; | 283 | struct nfs_seqid * lock_seqid; |
241 | struct nfs_seqid * open_seqid; | 284 | struct nfs_seqid * open_seqid; |
285 | struct nfs4_sequence_res seq_res; | ||
242 | }; | 286 | }; |
243 | 287 | ||
244 | struct nfs_locku_args { | 288 | struct nfs_locku_args { |
@@ -246,32 +290,38 @@ struct nfs_locku_args { | |||
246 | struct file_lock * fl; | 290 | struct file_lock * fl; |
247 | struct nfs_seqid * seqid; | 291 | struct nfs_seqid * seqid; |
248 | nfs4_stateid * stateid; | 292 | nfs4_stateid * stateid; |
293 | struct nfs4_sequence_args seq_args; | ||
249 | }; | 294 | }; |
250 | 295 | ||
251 | struct nfs_locku_res { | 296 | struct nfs_locku_res { |
252 | nfs4_stateid stateid; | 297 | nfs4_stateid stateid; |
253 | struct nfs_seqid * seqid; | 298 | struct nfs_seqid * seqid; |
299 | struct nfs4_sequence_res seq_res; | ||
254 | }; | 300 | }; |
255 | 301 | ||
256 | struct nfs_lockt_args { | 302 | struct nfs_lockt_args { |
257 | struct nfs_fh * fh; | 303 | struct nfs_fh * fh; |
258 | struct file_lock * fl; | 304 | struct file_lock * fl; |
259 | struct nfs_lowner lock_owner; | 305 | struct nfs_lowner lock_owner; |
306 | struct nfs4_sequence_args seq_args; | ||
260 | }; | 307 | }; |
261 | 308 | ||
262 | struct nfs_lockt_res { | 309 | struct nfs_lockt_res { |
263 | struct file_lock * denied; /* LOCK, LOCKT failed */ | 310 | struct file_lock * denied; /* LOCK, LOCKT failed */ |
311 | struct nfs4_sequence_res seq_res; | ||
264 | }; | 312 | }; |
265 | 313 | ||
266 | struct nfs4_delegreturnargs { | 314 | struct nfs4_delegreturnargs { |
267 | const struct nfs_fh *fhandle; | 315 | const struct nfs_fh *fhandle; |
268 | const nfs4_stateid *stateid; | 316 | const nfs4_stateid *stateid; |
269 | const u32 * bitmask; | 317 | const u32 * bitmask; |
318 | struct nfs4_sequence_args seq_args; | ||
270 | }; | 319 | }; |
271 | 320 | ||
272 | struct nfs4_delegreturnres { | 321 | struct nfs4_delegreturnres { |
273 | struct nfs_fattr * fattr; | 322 | struct nfs_fattr * fattr; |
274 | const struct nfs_server *server; | 323 | const struct nfs_server *server; |
324 | struct nfs4_sequence_res seq_res; | ||
275 | }; | 325 | }; |
276 | 326 | ||
277 | /* | 327 | /* |
@@ -284,12 +334,14 @@ struct nfs_readargs { | |||
284 | __u32 count; | 334 | __u32 count; |
285 | unsigned int pgbase; | 335 | unsigned int pgbase; |
286 | struct page ** pages; | 336 | struct page ** pages; |
337 | struct nfs4_sequence_args seq_args; | ||
287 | }; | 338 | }; |
288 | 339 | ||
289 | struct nfs_readres { | 340 | struct nfs_readres { |
290 | struct nfs_fattr * fattr; | 341 | struct nfs_fattr * fattr; |
291 | __u32 count; | 342 | __u32 count; |
292 | int eof; | 343 | int eof; |
344 | struct nfs4_sequence_res seq_res; | ||
293 | }; | 345 | }; |
294 | 346 | ||
295 | /* | 347 | /* |
@@ -304,6 +356,7 @@ struct nfs_writeargs { | |||
304 | unsigned int pgbase; | 356 | unsigned int pgbase; |
305 | struct page ** pages; | 357 | struct page ** pages; |
306 | const u32 * bitmask; | 358 | const u32 * bitmask; |
359 | struct nfs4_sequence_args seq_args; | ||
307 | }; | 360 | }; |
308 | 361 | ||
309 | struct nfs_writeverf { | 362 | struct nfs_writeverf { |
@@ -316,6 +369,7 @@ struct nfs_writeres { | |||
316 | struct nfs_writeverf * verf; | 369 | struct nfs_writeverf * verf; |
317 | __u32 count; | 370 | __u32 count; |
318 | const struct nfs_server *server; | 371 | const struct nfs_server *server; |
372 | struct nfs4_sequence_res seq_res; | ||
319 | }; | 373 | }; |
320 | 374 | ||
321 | /* | 375 | /* |
@@ -325,12 +379,14 @@ struct nfs_removeargs { | |||
325 | const struct nfs_fh *fh; | 379 | const struct nfs_fh *fh; |
326 | struct qstr name; | 380 | struct qstr name; |
327 | const u32 * bitmask; | 381 | const u32 * bitmask; |
382 | struct nfs4_sequence_args seq_args; | ||
328 | }; | 383 | }; |
329 | 384 | ||
330 | struct nfs_removeres { | 385 | struct nfs_removeres { |
331 | const struct nfs_server *server; | 386 | const struct nfs_server *server; |
332 | struct nfs4_change_info cinfo; | 387 | struct nfs4_change_info cinfo; |
333 | struct nfs_fattr dir_attr; | 388 | struct nfs_fattr dir_attr; |
389 | struct nfs4_sequence_res seq_res; | ||
334 | }; | 390 | }; |
335 | 391 | ||
336 | /* | 392 | /* |
@@ -383,6 +439,7 @@ struct nfs_setattrargs { | |||
383 | struct iattr * iap; | 439 | struct iattr * iap; |
384 | const struct nfs_server * server; /* Needed for name mapping */ | 440 | const struct nfs_server * server; /* Needed for name mapping */ |
385 | const u32 * bitmask; | 441 | const u32 * bitmask; |
442 | struct nfs4_sequence_args seq_args; | ||
386 | }; | 443 | }; |
387 | 444 | ||
388 | struct nfs_setaclargs { | 445 | struct nfs_setaclargs { |
@@ -390,6 +447,11 @@ struct nfs_setaclargs { | |||
390 | size_t acl_len; | 447 | size_t acl_len; |
391 | unsigned int acl_pgbase; | 448 | unsigned int acl_pgbase; |
392 | struct page ** acl_pages; | 449 | struct page ** acl_pages; |
450 | struct nfs4_sequence_args seq_args; | ||
451 | }; | ||
452 | |||
453 | struct nfs_setaclres { | ||
454 | struct nfs4_sequence_res seq_res; | ||
393 | }; | 455 | }; |
394 | 456 | ||
395 | struct nfs_getaclargs { | 457 | struct nfs_getaclargs { |
@@ -397,11 +459,18 @@ struct nfs_getaclargs { | |||
397 | size_t acl_len; | 459 | size_t acl_len; |
398 | unsigned int acl_pgbase; | 460 | unsigned int acl_pgbase; |
399 | struct page ** acl_pages; | 461 | struct page ** acl_pages; |
462 | struct nfs4_sequence_args seq_args; | ||
463 | }; | ||
464 | |||
465 | struct nfs_getaclres { | ||
466 | size_t acl_len; | ||
467 | struct nfs4_sequence_res seq_res; | ||
400 | }; | 468 | }; |
401 | 469 | ||
402 | struct nfs_setattrres { | 470 | struct nfs_setattrres { |
403 | struct nfs_fattr * fattr; | 471 | struct nfs_fattr * fattr; |
404 | const struct nfs_server * server; | 472 | const struct nfs_server * server; |
473 | struct nfs4_sequence_res seq_res; | ||
405 | }; | 474 | }; |
406 | 475 | ||
407 | struct nfs_linkargs { | 476 | struct nfs_linkargs { |
@@ -583,6 +652,7 @@ struct nfs4_accessargs { | |||
583 | const struct nfs_fh * fh; | 652 | const struct nfs_fh * fh; |
584 | const u32 * bitmask; | 653 | const u32 * bitmask; |
585 | u32 access; | 654 | u32 access; |
655 | struct nfs4_sequence_args seq_args; | ||
586 | }; | 656 | }; |
587 | 657 | ||
588 | struct nfs4_accessres { | 658 | struct nfs4_accessres { |
@@ -590,6 +660,7 @@ struct nfs4_accessres { | |||
590 | struct nfs_fattr * fattr; | 660 | struct nfs_fattr * fattr; |
591 | u32 supported; | 661 | u32 supported; |
592 | u32 access; | 662 | u32 access; |
663 | struct nfs4_sequence_res seq_res; | ||
593 | }; | 664 | }; |
594 | 665 | ||
595 | struct nfs4_create_arg { | 666 | struct nfs4_create_arg { |
@@ -609,6 +680,7 @@ struct nfs4_create_arg { | |||
609 | const struct iattr * attrs; | 680 | const struct iattr * attrs; |
610 | const struct nfs_fh * dir_fh; | 681 | const struct nfs_fh * dir_fh; |
611 | const u32 * bitmask; | 682 | const u32 * bitmask; |
683 | struct nfs4_sequence_args seq_args; | ||
612 | }; | 684 | }; |
613 | 685 | ||
614 | struct nfs4_create_res { | 686 | struct nfs4_create_res { |
@@ -617,21 +689,30 @@ struct nfs4_create_res { | |||
617 | struct nfs_fattr * fattr; | 689 | struct nfs_fattr * fattr; |
618 | struct nfs4_change_info dir_cinfo; | 690 | struct nfs4_change_info dir_cinfo; |
619 | struct nfs_fattr * dir_fattr; | 691 | struct nfs_fattr * dir_fattr; |
692 | struct nfs4_sequence_res seq_res; | ||
620 | }; | 693 | }; |
621 | 694 | ||
622 | struct nfs4_fsinfo_arg { | 695 | struct nfs4_fsinfo_arg { |
623 | const struct nfs_fh * fh; | 696 | const struct nfs_fh * fh; |
624 | const u32 * bitmask; | 697 | const u32 * bitmask; |
698 | struct nfs4_sequence_args seq_args; | ||
699 | }; | ||
700 | |||
701 | struct nfs4_fsinfo_res { | ||
702 | struct nfs_fsinfo *fsinfo; | ||
703 | struct nfs4_sequence_res seq_res; | ||
625 | }; | 704 | }; |
626 | 705 | ||
627 | struct nfs4_getattr_arg { | 706 | struct nfs4_getattr_arg { |
628 | const struct nfs_fh * fh; | 707 | const struct nfs_fh * fh; |
629 | const u32 * bitmask; | 708 | const u32 * bitmask; |
709 | struct nfs4_sequence_args seq_args; | ||
630 | }; | 710 | }; |
631 | 711 | ||
632 | struct nfs4_getattr_res { | 712 | struct nfs4_getattr_res { |
633 | const struct nfs_server * server; | 713 | const struct nfs_server * server; |
634 | struct nfs_fattr * fattr; | 714 | struct nfs_fattr * fattr; |
715 | struct nfs4_sequence_res seq_res; | ||
635 | }; | 716 | }; |
636 | 717 | ||
637 | struct nfs4_link_arg { | 718 | struct nfs4_link_arg { |
@@ -639,6 +720,7 @@ struct nfs4_link_arg { | |||
639 | const struct nfs_fh * dir_fh; | 720 | const struct nfs_fh * dir_fh; |
640 | const struct qstr * name; | 721 | const struct qstr * name; |
641 | const u32 * bitmask; | 722 | const u32 * bitmask; |
723 | struct nfs4_sequence_args seq_args; | ||
642 | }; | 724 | }; |
643 | 725 | ||
644 | struct nfs4_link_res { | 726 | struct nfs4_link_res { |
@@ -646,6 +728,7 @@ struct nfs4_link_res { | |||
646 | struct nfs_fattr * fattr; | 728 | struct nfs_fattr * fattr; |
647 | struct nfs4_change_info cinfo; | 729 | struct nfs4_change_info cinfo; |
648 | struct nfs_fattr * dir_attr; | 730 | struct nfs_fattr * dir_attr; |
731 | struct nfs4_sequence_res seq_res; | ||
649 | }; | 732 | }; |
650 | 733 | ||
651 | 734 | ||
@@ -653,21 +736,30 @@ struct nfs4_lookup_arg { | |||
653 | const struct nfs_fh * dir_fh; | 736 | const struct nfs_fh * dir_fh; |
654 | const struct qstr * name; | 737 | const struct qstr * name; |
655 | const u32 * bitmask; | 738 | const u32 * bitmask; |
739 | struct nfs4_sequence_args seq_args; | ||
656 | }; | 740 | }; |
657 | 741 | ||
658 | struct nfs4_lookup_res { | 742 | struct nfs4_lookup_res { |
659 | const struct nfs_server * server; | 743 | const struct nfs_server * server; |
660 | struct nfs_fattr * fattr; | 744 | struct nfs_fattr * fattr; |
661 | struct nfs_fh * fh; | 745 | struct nfs_fh * fh; |
746 | struct nfs4_sequence_res seq_res; | ||
662 | }; | 747 | }; |
663 | 748 | ||
664 | struct nfs4_lookup_root_arg { | 749 | struct nfs4_lookup_root_arg { |
665 | const u32 * bitmask; | 750 | const u32 * bitmask; |
751 | struct nfs4_sequence_args seq_args; | ||
666 | }; | 752 | }; |
667 | 753 | ||
668 | struct nfs4_pathconf_arg { | 754 | struct nfs4_pathconf_arg { |
669 | const struct nfs_fh * fh; | 755 | const struct nfs_fh * fh; |
670 | const u32 * bitmask; | 756 | const u32 * bitmask; |
757 | struct nfs4_sequence_args seq_args; | ||
758 | }; | ||
759 | |||
760 | struct nfs4_pathconf_res { | ||
761 | struct nfs_pathconf *pathconf; | ||
762 | struct nfs4_sequence_res seq_res; | ||
671 | }; | 763 | }; |
672 | 764 | ||
673 | struct nfs4_readdir_arg { | 765 | struct nfs4_readdir_arg { |
@@ -678,11 +770,13 @@ struct nfs4_readdir_arg { | |||
678 | struct page ** pages; /* zero-copy data */ | 770 | struct page ** pages; /* zero-copy data */ |
679 | unsigned int pgbase; /* zero-copy data */ | 771 | unsigned int pgbase; /* zero-copy data */ |
680 | const u32 * bitmask; | 772 | const u32 * bitmask; |
773 | struct nfs4_sequence_args seq_args; | ||
681 | }; | 774 | }; |
682 | 775 | ||
683 | struct nfs4_readdir_res { | 776 | struct nfs4_readdir_res { |
684 | nfs4_verifier verifier; | 777 | nfs4_verifier verifier; |
685 | unsigned int pgbase; | 778 | unsigned int pgbase; |
779 | struct nfs4_sequence_res seq_res; | ||
686 | }; | 780 | }; |
687 | 781 | ||
688 | struct nfs4_readlink { | 782 | struct nfs4_readlink { |
@@ -690,6 +784,11 @@ struct nfs4_readlink { | |||
690 | unsigned int pgbase; | 784 | unsigned int pgbase; |
691 | unsigned int pglen; /* zero-copy data */ | 785 | unsigned int pglen; /* zero-copy data */ |
692 | struct page ** pages; /* zero-copy data */ | 786 | struct page ** pages; /* zero-copy data */ |
787 | struct nfs4_sequence_args seq_args; | ||
788 | }; | ||
789 | |||
790 | struct nfs4_readlink_res { | ||
791 | struct nfs4_sequence_res seq_res; | ||
693 | }; | 792 | }; |
694 | 793 | ||
695 | struct nfs4_rename_arg { | 794 | struct nfs4_rename_arg { |
@@ -698,6 +797,7 @@ struct nfs4_rename_arg { | |||
698 | const struct qstr * old_name; | 797 | const struct qstr * old_name; |
699 | const struct qstr * new_name; | 798 | const struct qstr * new_name; |
700 | const u32 * bitmask; | 799 | const u32 * bitmask; |
800 | struct nfs4_sequence_args seq_args; | ||
701 | }; | 801 | }; |
702 | 802 | ||
703 | struct nfs4_rename_res { | 803 | struct nfs4_rename_res { |
@@ -706,6 +806,7 @@ struct nfs4_rename_res { | |||
706 | struct nfs_fattr * old_fattr; | 806 | struct nfs_fattr * old_fattr; |
707 | struct nfs4_change_info new_cinfo; | 807 | struct nfs4_change_info new_cinfo; |
708 | struct nfs_fattr * new_fattr; | 808 | struct nfs_fattr * new_fattr; |
809 | struct nfs4_sequence_res seq_res; | ||
709 | }; | 810 | }; |
710 | 811 | ||
711 | #define NFS4_SETCLIENTID_NAMELEN (127) | 812 | #define NFS4_SETCLIENTID_NAMELEN (127) |
@@ -724,6 +825,17 @@ struct nfs4_setclientid { | |||
724 | struct nfs4_statfs_arg { | 825 | struct nfs4_statfs_arg { |
725 | const struct nfs_fh * fh; | 826 | const struct nfs_fh * fh; |
726 | const u32 * bitmask; | 827 | const u32 * bitmask; |
828 | struct nfs4_sequence_args seq_args; | ||
829 | }; | ||
830 | |||
831 | struct nfs4_statfs_res { | ||
832 | struct nfs_fsstat *fsstat; | ||
833 | struct nfs4_sequence_res seq_res; | ||
834 | }; | ||
835 | |||
836 | struct nfs4_server_caps_arg { | ||
837 | struct nfs_fh *fhandle; | ||
838 | struct nfs4_sequence_args seq_args; | ||
727 | }; | 839 | }; |
728 | 840 | ||
729 | struct nfs4_server_caps_res { | 841 | struct nfs4_server_caps_res { |
@@ -731,6 +843,7 @@ struct nfs4_server_caps_res { | |||
731 | u32 acl_bitmask; | 843 | u32 acl_bitmask; |
732 | u32 has_links; | 844 | u32 has_links; |
733 | u32 has_symlinks; | 845 | u32 has_symlinks; |
846 | struct nfs4_sequence_res seq_res; | ||
734 | }; | 847 | }; |
735 | 848 | ||
736 | struct nfs4_string { | 849 | struct nfs4_string { |
@@ -765,10 +878,68 @@ struct nfs4_fs_locations_arg { | |||
765 | const struct qstr *name; | 878 | const struct qstr *name; |
766 | struct page *page; | 879 | struct page *page; |
767 | const u32 *bitmask; | 880 | const u32 *bitmask; |
881 | struct nfs4_sequence_args seq_args; | ||
882 | }; | ||
883 | |||
884 | struct nfs4_fs_locations_res { | ||
885 | struct nfs4_fs_locations *fs_locations; | ||
886 | struct nfs4_sequence_res seq_res; | ||
768 | }; | 887 | }; |
769 | 888 | ||
770 | #endif /* CONFIG_NFS_V4 */ | 889 | #endif /* CONFIG_NFS_V4 */ |
771 | 890 | ||
891 | struct nfstime4 { | ||
892 | u64 seconds; | ||
893 | u32 nseconds; | ||
894 | }; | ||
895 | |||
896 | #ifdef CONFIG_NFS_V4_1 | ||
897 | struct nfs_impl_id4 { | ||
898 | u32 domain_len; | ||
899 | char *domain; | ||
900 | u32 name_len; | ||
901 | char *name; | ||
902 | struct nfstime4 date; | ||
903 | }; | ||
904 | |||
905 | #define NFS4_EXCHANGE_ID_LEN (48) | ||
906 | struct nfs41_exchange_id_args { | ||
907 | struct nfs_client *client; | ||
908 | nfs4_verifier *verifier; | ||
909 | unsigned int id_len; | ||
910 | char id[NFS4_EXCHANGE_ID_LEN]; | ||
911 | u32 flags; | ||
912 | }; | ||
913 | |||
914 | struct server_owner { | ||
915 | uint64_t minor_id; | ||
916 | uint32_t major_id_sz; | ||
917 | char major_id[NFS4_OPAQUE_LIMIT]; | ||
918 | }; | ||
919 | |||
920 | struct server_scope { | ||
921 | uint32_t server_scope_sz; | ||
922 | char server_scope[NFS4_OPAQUE_LIMIT]; | ||
923 | }; | ||
924 | |||
925 | struct nfs41_exchange_id_res { | ||
926 | struct nfs_client *client; | ||
927 | u32 flags; | ||
928 | }; | ||
929 | |||
930 | struct nfs41_create_session_args { | ||
931 | struct nfs_client *client; | ||
932 | uint32_t flags; | ||
933 | uint32_t cb_program; | ||
934 | struct nfs4_channel_attrs fc_attrs; /* Fore Channel */ | ||
935 | struct nfs4_channel_attrs bc_attrs; /* Back Channel */ | ||
936 | }; | ||
937 | |||
938 | struct nfs41_create_session_res { | ||
939 | struct nfs_client *client; | ||
940 | }; | ||
941 | #endif /* CONFIG_NFS_V4_1 */ | ||
942 | |||
772 | struct nfs_page; | 943 | struct nfs_page; |
773 | 944 | ||
774 | #define NFS_PAGEVEC_SIZE (8U) | 945 | #define NFS_PAGEVEC_SIZE (8U) |