summaryrefslogtreecommitdiffstats
path: root/fs/cifs/cifsglob.h
diff options
context:
space:
mode:
authorPavel Shilovsky2012-09-19 01:20:26 +0200
committerSteve French2012-09-25 04:46:26 +0200
commit4b4de76e35518fc0c636f628abca8c1b19ad6689 (patch)
tree18b27673849d55235c216f0cbb811e1aa4b87ae9 /fs/cifs/cifsglob.h
parentCIFS: Add SMB2 support for unlink (diff)
downloadkernel-qcow2-linux-4b4de76e35518fc0c636f628abca8c1b19ad6689.tar.gz
kernel-qcow2-linux-4b4de76e35518fc0c636f628abca8c1b19ad6689.tar.xz
kernel-qcow2-linux-4b4de76e35518fc0c636f628abca8c1b19ad6689.zip
CIFS: Replace netfid with cifs_fid struct in cifsFileInfo
This is help us to extend the code for future protocols that can use another fid mechanism (as SMB2 that has it divided into two parts: persistent and violatile). Also rename variables and refactor the code around the changes. Reviewed-by: Jeff Layton <jlayton@samba.org> 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.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 843356fa262d..a2a3865dee1b 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -746,6 +746,10 @@ struct cifs_search_info {
bool smallBuf:1; /* so we know which buf_release function to call */
};
+struct cifs_fid {
+ __u16 netfid;
+};
+
struct cifsFileInfo {
struct list_head tlist; /* pointer to next fid owned by tcon */
struct list_head flist; /* next fid (file instance) for this inode */
@@ -755,7 +759,7 @@ struct cifsFileInfo {
*/
unsigned int uid; /* allows finding which FileInfo structure */
__u32 pid; /* process id who opened file */
- __u16 netfid; /* file id from remote */
+ struct cifs_fid fid; /* file id from remote */
/* BB add lock scope info here if needed */ ;
/* lock scope id (0 if none) */
struct dentry *dentry;