2012/5/16 Jeff Layton <jlayton@xxxxxxxxxx>: > On Wed, 16 May 2012 13:57:34 +0400 > Pavel Shilovsky <piastry@xxxxxxxxxxx> wrote: > >> Signed-off-by: Pavel Shilovsky <piastry@xxxxxxxxxxx> >> --- >> fs/cifs/file.c | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/fs/cifs/file.c b/fs/cifs/file.c >> index 9c2d85d..ed9b5a8 100644 >> --- a/fs/cifs/file.c >> +++ b/fs/cifs/file.c >> @@ -1357,8 +1357,8 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type, >> if (rc <= 0) >> goto out; >> >> - rc = CIFSSMBLock(xid, tcon, netfid, current->tgid, length, >> - flock->fl_start, 0, 1, type, wait_flag, 0); >> + rc = cifs_mandatory_lock(xid, cfile, flock->fl_start, length, >> + type, 1, 0, wait_flag); >> if (rc) { >> kfree(lock); >> goto out; > > You can probably roll this in with patch #4 since it's a very similar > change and so small... > > Looks fine though. I guess at some point you'll need to add a > ops->mandatory_lock or something? Yes - it will be the next step. -- Best regards, Pavel Shilovsky. -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html