smb/client: adapt to breakup of struct file_lock

[thirdparty/linux.git] / fs / smb / client / cifssmb.c

diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c
index e19ecf692c200b5457474c8d527b17f73295879e..5eb83bafc7fd2bfda2693e6b8f637a5c0292dbc0 100644 (file)
--- a/fs/smb/client/cifssmb.c
+++ b/fs/smb/client/cifssmb.c
@@ -15,7 +15,6 @@
  /* want to reuse a stale file handle and only the caller knows the file info */
 
 #include <linux/fs.h>
-#define _NEED_FILE_LOCK_FIELD_MACROS
 #include <linux/filelock.h>
 #include <linux/kernel.h>
 #include <linux/vfs.h>
@@ -2067,20 +2066,20 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon,
                parm_data = (struct cifs_posix_lock *)
                        ((char *)&pSMBr->hdr.Protocol + data_offset);
                if (parm_data->lock_type == cpu_to_le16(CIFS_UNLCK))
-                       pLockData->fl_type = F_UNLCK;
+                       pLockData->c.flc_type = F_UNLCK;
                else {
                        if (parm_data->lock_type ==
                                        cpu_to_le16(CIFS_RDLCK))
-                               pLockData->fl_type = F_RDLCK;
+                               pLockData->c.flc_type = F_RDLCK;
                        else if (parm_data->lock_type ==
                                        cpu_to_le16(CIFS_WRLCK))
-                               pLockData->fl_type = F_WRLCK;
+                               pLockData->c.flc_type = F_WRLCK;
 
                        pLockData->fl_start = le64_to_cpu(parm_data->start);
                        pLockData->fl_end = pLockData->fl_start +
                                (le64_to_cpu(parm_data->length) ?
                                 le64_to_cpu(parm_data->length) - 1 : 0);
-                       pLockData->fl_pid = -le32_to_cpu(parm_data->pid);
+                       pLockData->c.flc_pid = -le32_to_cpu(parm_data->pid);
                }
        }