CIFS: Move byte range lock list from fd to inode

[profile/ivi/kernel-x86-ivi.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 1f265ff..55ebf39 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -494,6 +494,7 @@ struct cifsLockInfo {
        __u64 length;
        __u32 pid;
        __u8 type;
+       __u16 netfid;
 };
 
 /*
@@ -526,8 +527,6 @@ struct cifsFileInfo {
        struct dentry *dentry;
        unsigned int f_flags;
        struct tcon_link *tlink;
-       struct mutex lock_mutex;
-       struct list_head llist; /* list of byte range locks we have. */
        bool invalidHandle:1;   /* file closed via session abend */
        bool oplock_break_cancelled:1;
        int count;              /* refcount protected by cifs_file_list_lock */
@@ -560,7 +559,9 @@ void cifsFileInfo_put(struct cifsFileInfo *cifs_file);
  */
 
 struct cifsInodeInfo {
-       struct list_head lockList;
+       struct list_head llist;         /* brlocks for this inode */
+       bool can_cache_brlcks;
+       struct mutex lock_mutex;        /* protect two fields above */
        /* BB add in lists for dirty pages i.e. write caching info for oplock */
        struct list_head openFileList;
        __u32 cifsAttrs; /* e.g. DOS archive bit, sparse, compressed, system */