diff options
author | Pavel Shilovsky <pshilovsky@samba.org> | 2012-09-18 19:20:29 -0400 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-09-24 22:46:27 -0400 |
commit | 09a4707e7638247302c6d798061aed117141fb74 (patch) | |
tree | d31b23d8b91941b30425d6a4d8235d9e91d7afef /fs/cifs/cifsglob.h | |
parent | fc9c59662e0cd37577556d0de865268baeb9b293 (diff) |
CIFS: Add SMB2 support for cifs_iovec_read
Signed-off-by: Pavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index fcf81c05635f..93dd582bb8d1 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -857,12 +857,37 @@ struct cifsFileInfo { | |||
857 | 857 | ||
858 | struct cifs_io_parms { | 858 | struct cifs_io_parms { |
859 | __u16 netfid; | 859 | __u16 netfid; |
860 | #ifdef CONFIG_CIFS_SMB2 | ||
861 | __u64 persistent_fid; /* persist file id for smb2 */ | ||
862 | __u64 volatile_fid; /* volatile file id for smb2 */ | ||
863 | #endif | ||
860 | __u32 pid; | 864 | __u32 pid; |
861 | __u64 offset; | 865 | __u64 offset; |
862 | unsigned int length; | 866 | unsigned int length; |
863 | struct cifs_tcon *tcon; | 867 | struct cifs_tcon *tcon; |
864 | }; | 868 | }; |
865 | 869 | ||
870 | struct cifs_readdata; | ||
871 | |||
872 | /* asynchronous read support */ | ||
873 | struct cifs_readdata { | ||
874 | struct kref refcount; | ||
875 | struct list_head list; | ||
876 | struct completion done; | ||
877 | struct cifsFileInfo *cfile; | ||
878 | struct address_space *mapping; | ||
879 | __u64 offset; | ||
880 | unsigned int bytes; | ||
881 | pid_t pid; | ||
882 | int result; | ||
883 | struct list_head pages; | ||
884 | struct work_struct work; | ||
885 | int (*marshal_iov) (struct cifs_readdata *rdata, | ||
886 | unsigned int remaining); | ||
887 | unsigned int nr_iov; | ||
888 | struct kvec iov[1]; | ||
889 | }; | ||
890 | |||
866 | /* | 891 | /* |
867 | * Take a reference on the file private data. Must be called with | 892 | * Take a reference on the file private data. Must be called with |
868 | * cifs_file_list_lock held. | 893 | * cifs_file_list_lock held. |