| Message ID | 20180810010355.21384-1-lsahlber@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | cifs: add missing support for ACLs in SMB 3.11 | expand |
merged into cifs-2.6.git for-next and cc: stable On Thu, Aug 9, 2018 at 8:04 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote: > > We were missing the methods for get_acl and friends for the 3.11 > dialect. > > Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> > --- > fs/cifs/smb2ops.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c > index 7869ea4f6fab..541258447c4c 100644 > --- a/fs/cifs/smb2ops.c > +++ b/fs/cifs/smb2ops.c > @@ -3586,6 +3586,11 @@ struct smb_version_operations smb311_operations = { > .query_all_EAs = smb2_query_eas, > .set_EA = smb2_set_ea, > #endif /* CIFS_XATTR */ > +#ifdef CONFIG_CIFS_ACL > + .get_acl = get_smb2_acl, > + .get_acl_by_fid = get_smb2_acl_by_fid, > + .set_acl = set_smb2_acl, > +#endif /* CIFS_ACL */ > .next_header = smb2_next_header, > }; > > -- > 2.13.3 >
2018-08-09 19:14 GMT-07:00 Steve French <smfrench@gmail.com>: > merged into cifs-2.6.git for-next and cc: stable > On Thu, Aug 9, 2018 at 8:04 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote: >> >> We were missing the methods for get_acl and friends for the 3.11 >> dialect. >> >> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> >> --- >> fs/cifs/smb2ops.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c >> index 7869ea4f6fab..541258447c4c 100644 >> --- a/fs/cifs/smb2ops.c >> +++ b/fs/cifs/smb2ops.c >> @@ -3586,6 +3586,11 @@ struct smb_version_operations smb311_operations = { >> .query_all_EAs = smb2_query_eas, >> .set_EA = smb2_set_ea, >> #endif /* CIFS_XATTR */ >> +#ifdef CONFIG_CIFS_ACL >> + .get_acl = get_smb2_acl, >> + .get_acl_by_fid = get_smb2_acl_by_fid, >> + .set_acl = set_smb2_acl, >> +#endif /* CIFS_ACL */ >> .next_header = smb2_next_header, >> }; >> >> -- >> 2.13.3 >> > > > -- > Thanks, > > Steve Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> -- Best regards, Pavel Shilovsky
add reviewed-by tags and repushed to cifs-2.6.git for-next On Fri, Aug 10, 2018 at 11:04 AM Pavel Shilovsky <piastryyy@gmail.com> wrote: > > 2018-08-09 19:14 GMT-07:00 Steve French <smfrench@gmail.com>: > > merged into cifs-2.6.git for-next and cc: stable > > On Thu, Aug 9, 2018 at 8:04 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote: > >> > >> We were missing the methods for get_acl and friends for the 3.11 > >> dialect. > >> > >> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> > >> --- > >> fs/cifs/smb2ops.c | 5 +++++ > >> 1 file changed, 5 insertions(+) > >> > >> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c > >> index 7869ea4f6fab..541258447c4c 100644 > >> --- a/fs/cifs/smb2ops.c > >> +++ b/fs/cifs/smb2ops.c > >> @@ -3586,6 +3586,11 @@ struct smb_version_operations smb311_operations = { > >> .query_all_EAs = smb2_query_eas, > >> .set_EA = smb2_set_ea, > >> #endif /* CIFS_XATTR */ > >> +#ifdef CONFIG_CIFS_ACL > >> + .get_acl = get_smb2_acl, > >> + .get_acl_by_fid = get_smb2_acl_by_fid, > >> + .set_acl = set_smb2_acl, > >> +#endif /* CIFS_ACL */ > >> .next_header = smb2_next_header, > >> }; > >> > >> -- > >> 2.13.3 > >> > > > > > > -- > > Thanks, > > > > Steve > > Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> > > -- > Best regards, > Pavel Shilovsky
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 7869ea4f6fab..541258447c4c 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -3586,6 +3586,11 @@ struct smb_version_operations smb311_operations = { .query_all_EAs = smb2_query_eas, .set_EA = smb2_set_ea, #endif /* CIFS_XATTR */ +#ifdef CONFIG_CIFS_ACL + .get_acl = get_smb2_acl, + .get_acl_by_fid = get_smb2_acl_by_fid, + .set_acl = set_smb2_acl, +#endif /* CIFS_ACL */ .next_header = smb2_next_header, };
We were missing the methods for get_acl and friends for the 3.11 dialect. Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> --- fs/cifs/smb2ops.c | 5 +++++ 1 file changed, 5 insertions(+)