2013/1/31 J. Bruce Fields <bfields@xxxxxxxxxxxx>:
> On Thu, Jan 17, 2013 at 08:53:00PM +0400, Pavel Shilovsky wrote:
>> Make CIFSSMBOpen take share_flags as a parm that allows us
>> to pass new O_DENY* flags to the server.
>>
>> Signed-off-by: Pavel Shilovsky <piastry@xxxxxxxxxxx>
>> ---
>> fs/cifs/cifsacl.c | 10 ++++++----
>> fs/cifs/cifsglob.h | 12 +++++++++++-
>> fs/cifs/cifsproto.h | 9 +++++----
>> fs/cifs/cifssmb.c | 47 +++++++++++++++++++++++++----------------------
>> fs/cifs/dir.c | 13 ++++++++-----
>> fs/cifs/file.c | 12 ++++++++----
>> fs/cifs/inode.c | 11 ++++++-----
>> fs/cifs/link.c | 10 +++++-----
>> fs/cifs/readdir.c | 2 +-
>> fs/cifs/smb1ops.c | 15 ++++++++-------
>> fs/cifs/smb2file.c | 10 +++++-----
>> fs/cifs/smb2inode.c | 4 ++--
>> fs/cifs/smb2ops.c | 10 ++++++----
>> fs/cifs/smb2pdu.c | 6 +++---
>> fs/cifs/smb2proto.h | 14 ++++++++------
>> 15 files changed, 107 insertions(+), 78 deletions(-)
>>
>> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
>> index 0fb15bb..a42c77f 100644
>> --- a/fs/cifs/cifsacl.c
>> +++ b/fs/cifs/cifsacl.c
>> @@ -1184,8 +1184,9 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb,
>> create_options |= CREATE_OPEN_BACKUP_INTENT;
>>
>> rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, READ_CONTROL,
>> - create_options, &fid, &oplock, NULL, cifs_sb->local_nls,
>> - cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
>> + FILE_SHARE_ALL, create_options, &fid, &oplock,
>> + NULL, cifs_sb->local_nls,
>> + cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
>> if (!rc) {
>> rc = CIFSSMBGetCIFSACL(xid, tcon, fid, &pntsd, pacllen);
>> CIFSSMBClose(xid, tcon, fid);
>> @@ -1245,8 +1246,9 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen,
>> access_flags = WRITE_DAC;
>>
>> rc = CIFSSMBOpen(xid, tcon, path, FILE_OPEN, access_flags,
>> - create_options, &fid, &oplock, NULL, cifs_sb->local_nls,
>> - cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
>> + FILE_SHARE_ALL, create_options, &fid, &oplock,
>> + NULL, cifs_sb->local_nls,
>> + cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);
>
> It would be easier to tell what you changed in the above two chunks if
> you didn't change the whitespace at the same time.
>
> --b.
Ok, thank - will fix it in the further version of the patch.
--
Best regards,
Pavel Shilovsky.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
