Commit 04a6aa8a authored by Pavel Shilovsky's avatar Pavel Shilovsky Committed by Steve French

CIFS: Convert lock type to 32 bit variable

to handle SMB2 lock type field further.
Acked-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarPavel Shilovsky <piastry@etersoft.ru>
parent fbd35aca
...@@ -567,7 +567,7 @@ struct cifsLockInfo { ...@@ -567,7 +567,7 @@ struct cifsLockInfo {
__u64 offset; __u64 offset;
__u64 length; __u64 length;
__u32 pid; __u32 pid;
__u8 type; __u32 type;
}; };
/* /*
......
...@@ -912,7 +912,8 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) ...@@ -912,7 +912,8 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
cur->OffsetHigh = cpu_to_le32((u32)(li->offset>>32)); cur->OffsetHigh = cpu_to_le32((u32)(li->offset>>32));
if (++num == max_num) { if (++num == max_num) {
stored_rc = cifs_lockv(xid, tcon, cfile->netfid, stored_rc = cifs_lockv(xid, tcon, cfile->netfid,
li->type, 0, num, buf); (__u8)li->type, 0, num,
buf);
if (stored_rc) if (stored_rc)
rc = stored_rc; rc = stored_rc;
cur = buf; cur = buf;
...@@ -923,7 +924,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile) ...@@ -923,7 +924,7 @@ cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
if (num) { if (num) {
stored_rc = cifs_lockv(xid, tcon, cfile->netfid, stored_rc = cifs_lockv(xid, tcon, cfile->netfid,
types[i], 0, num, buf); (__u8)types[i], 0, num, buf);
if (stored_rc) if (stored_rc)
rc = stored_rc; rc = stored_rc;
} }
...@@ -1067,7 +1068,7 @@ cifs_push_locks(struct cifsFileInfo *cfile) ...@@ -1067,7 +1068,7 @@ cifs_push_locks(struct cifsFileInfo *cfile)
} }
static void static void
cifs_read_flock(struct file_lock *flock, __u8 *type, int *lock, int *unlock, cifs_read_flock(struct file_lock *flock, __u32 *type, int *lock, int *unlock,
bool *wait_flag) bool *wait_flag)
{ {
if (flock->fl_flags & FL_POSIX) if (flock->fl_flags & FL_POSIX)
...@@ -1111,7 +1112,7 @@ cifs_read_flock(struct file_lock *flock, __u8 *type, int *lock, int *unlock, ...@@ -1111,7 +1112,7 @@ cifs_read_flock(struct file_lock *flock, __u8 *type, int *lock, int *unlock,
} }
static int static int
cifs_getlk(struct file *file, struct file_lock *flock, __u8 type, cifs_getlk(struct file *file, struct file_lock *flock, __u32 type,
bool wait_flag, bool posix_lck, int xid) bool wait_flag, bool posix_lck, int xid)
{ {
int rc = 0; int rc = 0;
...@@ -1299,7 +1300,7 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock, int xid) ...@@ -1299,7 +1300,7 @@ cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock, int xid)
} }
static int static int
cifs_setlk(struct file *file, struct file_lock *flock, __u8 type, cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
bool wait_flag, bool posix_lck, int lock, int unlock, int xid) bool wait_flag, bool posix_lck, int lock, int unlock, int xid)
{ {
int rc = 0; int rc = 0;
...@@ -1370,7 +1371,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock) ...@@ -1370,7 +1371,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
struct cifsInodeInfo *cinode; struct cifsInodeInfo *cinode;
struct cifsFileInfo *cfile; struct cifsFileInfo *cfile;
__u16 netfid; __u16 netfid;
__u8 type; __u32 type;
rc = -EACCES; rc = -EACCES;
xid = GetXid(); xid = GetXid();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment