diff options
Diffstat (limited to 'fs/cifs/cifsglob.h')
-rw-r--r-- | fs/cifs/cifsglob.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 1f265ffe7e63..55ebf39fb3fd 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -494,6 +494,7 @@ struct cifsLockInfo { | |||
494 | __u64 length; | 494 | __u64 length; |
495 | __u32 pid; | 495 | __u32 pid; |
496 | __u8 type; | 496 | __u8 type; |
497 | __u16 netfid; | ||
497 | }; | 498 | }; |
498 | 499 | ||
499 | /* | 500 | /* |
@@ -526,8 +527,6 @@ struct cifsFileInfo { | |||
526 | struct dentry *dentry; | 527 | struct dentry *dentry; |
527 | unsigned int f_flags; | 528 | unsigned int f_flags; |
528 | struct tcon_link *tlink; | 529 | struct tcon_link *tlink; |
529 | struct mutex lock_mutex; | ||
530 | struct list_head llist; /* list of byte range locks we have. */ | ||
531 | bool invalidHandle:1; /* file closed via session abend */ | 530 | bool invalidHandle:1; /* file closed via session abend */ |
532 | bool oplock_break_cancelled:1; | 531 | bool oplock_break_cancelled:1; |
533 | int count; /* refcount protected by cifs_file_list_lock */ | 532 | int count; /* refcount protected by cifs_file_list_lock */ |
@@ -560,7 +559,9 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file); | |||
560 | */ | 559 | */ |
561 | 560 | ||
562 | struct cifsInodeInfo { | 561 | struct cifsInodeInfo { |
563 | struct list_head lockList; | 562 | struct list_head llist; /* brlocks for this inode */ |
563 | bool can_cache_brlcks; | ||
564 | struct mutex lock_mutex; /* protect two fields above */ | ||
564 | /* BB add in lists for dirty pages i.e. write caching info for oplock */ | 565 | /* BB add in lists for dirty pages i.e. write caching info for oplock */ |
565 | struct list_head openFileList; | 566 | struct list_head openFileList; |
566 | __u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */ | 567 | __u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */ |