fs/cifs/smb2transport.c: Make some functions static
diff mbox series

Message ID 1569046966-118677-1-git-send-email-zhengbin13@huawei.com
State New
Headers show
Series
  • fs/cifs/smb2transport.c: Make some functions static
Related show

Commit Message

zhengbin Sept. 21, 2019, 6:22 a.m. UTC
Fix sparse warnings:

fs/cifs/smb2transport.c:52:1: warning: symbol 'smb3_crypto_shash_allocate' was not declared. Should it be static?
fs/cifs/smb2transport.c:101:4: warning: symbol 'smb2_find_chan_signkey' was not declared. Should it be static?
fs/cifs/smb2transport.c:121:17: warning: symbol 'smb2_find_global_smb_ses' was not declared. Should it be static?

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
---
 fs/cifs/smb2transport.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--
2.7.4

Comments

Steve French Sept. 23, 2019, 5:07 a.m. UTC | #1
Thanks - merged into cifs-2.6.git for-next

Aurélien -
FYI - it makes minor update to code you changed to remove the warning.


On Sun, Sep 22, 2019 at 2:13 PM zhengbin <zhengbin13@huawei.com> wrote:
>
> Fix sparse warnings:
>
> fs/cifs/smb2transport.c:52:1: warning: symbol 'smb3_crypto_shash_allocate' was not declared. Should it be static?
> fs/cifs/smb2transport.c:101:4: warning: symbol 'smb2_find_chan_signkey' was not declared. Should it be static?
> fs/cifs/smb2transport.c:121:17: warning: symbol 'smb2_find_global_smb_ses' was not declared. Should it be static?
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> ---
>  fs/cifs/smb2transport.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
> index 12988df..7cc8641 100644
> --- a/fs/cifs/smb2transport.c
> +++ b/fs/cifs/smb2transport.c
> @@ -48,7 +48,7 @@ smb2_crypto_shash_allocate(struct TCP_Server_Info *server)
>                                &server->secmech.sdeschmacsha256);
>  }
>
> -int
> +static int
>  smb3_crypto_shash_allocate(struct TCP_Server_Info *server)
>  {
>         struct cifs_secmech *p = &server->secmech;
> @@ -98,7 +98,8 @@ smb311_crypto_shash_allocate(struct TCP_Server_Info *server)
>         return rc;
>  }
>
> -u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> +static u8 *
> +smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>  {
>         int i;
>         struct cifs_chan *chan;
> @@ -118,7 +119,7 @@ u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>         return NULL;
>  }
>
> -struct cifs_ses *
> +static struct cifs_ses *
>  smb2_find_global_smb_ses(__u64 ses_id)
>  {
>         struct TCP_Server_Info *server;
> --
> 2.7.4
>
zhengbin Sept. 23, 2019, 6:07 a.m. UTC | #2
On 2019/9/23 13:07, Steve French wrote:
> Thanks - merged into cifs-2.6.git for-next
>
> Aurélien -
> FYI - it makes minor update to code you changed to remove the warning.

We have a similar warning in fs/cifs/smb2pdu.c

fs/cifs/smb2pdu.c:3184:1: warning: symbol 'SMB2_notify_init' was not declared. Should it be static?
fs/cifs/smb2pdu.c:3213:1: warning: symbol 'SMB2_change_notify' was not declared. Should it be static?


while these two functions are introduced by commit af8d46ab49b8

("smb3: add missing worker function for SMB3 change notify"). SMB2_notify_init is called by SMB2_change_notify

No one calls  SMB2_change_notify? Or we will call SMB2_change_notify in the future?

>
>
> On Sun, Sep 22, 2019 at 2:13 PM zhengbin <zhengbin13@huawei.com> wrote:
>> Fix sparse warnings:
>>
>> fs/cifs/smb2transport.c:52:1: warning: symbol 'smb3_crypto_shash_allocate' was not declared. Should it be static?
>> fs/cifs/smb2transport.c:101:4: warning: symbol 'smb2_find_chan_signkey' was not declared. Should it be static?
>> fs/cifs/smb2transport.c:121:17: warning: symbol 'smb2_find_global_smb_ses' was not declared. Should it be static?
>>
>> Reported-by: Hulk Robot <hulkci@huawei.com>
>> Signed-off-by: zhengbin <zhengbin13@huawei.com>
>> ---
>>  fs/cifs/smb2transport.c | 7 ++++---
>>  1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
>> index 12988df..7cc8641 100644
>> --- a/fs/cifs/smb2transport.c
>> +++ b/fs/cifs/smb2transport.c
>> @@ -48,7 +48,7 @@ smb2_crypto_shash_allocate(struct TCP_Server_Info *server)
>>                                &server->secmech.sdeschmacsha256);
>>  }
>>
>> -int
>> +static int
>>  smb3_crypto_shash_allocate(struct TCP_Server_Info *server)
>>  {
>>         struct cifs_secmech *p = &server->secmech;
>> @@ -98,7 +98,8 @@ smb311_crypto_shash_allocate(struct TCP_Server_Info *server)
>>         return rc;
>>  }
>>
>> -u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>> +static u8 *
>> +smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>>  {
>>         int i;
>>         struct cifs_chan *chan;
>> @@ -118,7 +119,7 @@ u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>>         return NULL;
>>  }
>>
>> -struct cifs_ses *
>> +static struct cifs_ses *
>>  smb2_find_global_smb_ses(__u64 ses_id)
>>  {
>>         struct TCP_Server_Info *server;
>> --
>> 2.7.4
>>
>
Steve French Sept. 23, 2019, 6:33 a.m. UTC | #3
The code to call SMB2_change_notify (from an ioctl) should make it in
pretty soon (let's hope we can finish testing it this  week).   The
fix to inotify to allow inotify to call into a network file system
will be helpful in the long run, but in the short term at least a GUI
should be able to call into a cifs.ko specific ioctl soon for it.

On Mon, Sep 23, 2019 at 1:08 AM zhengbin (A) <zhengbin13@huawei.com> wrote:
>
>
> On 2019/9/23 13:07, Steve French wrote:
> > Thanks - merged into cifs-2.6.git for-next
> >
> > Aurélien -
> > FYI - it makes minor update to code you changed to remove the warning.
>
> We have a similar warning in fs/cifs/smb2pdu.c
>
> fs/cifs/smb2pdu.c:3184:1: warning: symbol 'SMB2_notify_init' was not declared. Should it be static?
> fs/cifs/smb2pdu.c:3213:1: warning: symbol 'SMB2_change_notify' was not declared. Should it be static?
>
>
> while these two functions are introduced by commit af8d46ab49b8
>
> ("smb3: add missing worker function for SMB3 change notify"). SMB2_notify_init is called by SMB2_change_notify
>
> No one calls  SMB2_change_notify? Or we will call SMB2_change_notify in the future?
>
> >
> >
> > On Sun, Sep 22, 2019 at 2:13 PM zhengbin <zhengbin13@huawei.com> wrote:
> >> Fix sparse warnings:
> >>
> >> fs/cifs/smb2transport.c:52:1: warning: symbol 'smb3_crypto_shash_allocate' was not declared. Should it be static?
> >> fs/cifs/smb2transport.c:101:4: warning: symbol 'smb2_find_chan_signkey' was not declared. Should it be static?
> >> fs/cifs/smb2transport.c:121:17: warning: symbol 'smb2_find_global_smb_ses' was not declared. Should it be static?
> >>
> >> Reported-by: Hulk Robot <hulkci@huawei.com>
> >> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> >> ---
> >>  fs/cifs/smb2transport.c | 7 ++++---
> >>  1 file changed, 4 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
> >> index 12988df..7cc8641 100644
> >> --- a/fs/cifs/smb2transport.c
> >> +++ b/fs/cifs/smb2transport.c
> >> @@ -48,7 +48,7 @@ smb2_crypto_shash_allocate(struct TCP_Server_Info *server)
> >>                                &server->secmech.sdeschmacsha256);
> >>  }
> >>
> >> -int
> >> +static int
> >>  smb3_crypto_shash_allocate(struct TCP_Server_Info *server)
> >>  {
> >>         struct cifs_secmech *p = &server->secmech;
> >> @@ -98,7 +98,8 @@ smb311_crypto_shash_allocate(struct TCP_Server_Info *server)
> >>         return rc;
> >>  }
> >>
> >> -u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> >> +static u8 *
> >> +smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> >>  {
> >>         int i;
> >>         struct cifs_chan *chan;
> >> @@ -118,7 +119,7 @@ u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> >>         return NULL;
> >>  }
> >>
> >> -struct cifs_ses *
> >> +static struct cifs_ses *
> >>  smb2_find_global_smb_ses(__u64 ses_id)
> >>  {
> >>         struct TCP_Server_Info *server;
> >> --
> >> 2.7.4
> >>
> >
>
zhengbin Sept. 23, 2019, 6:47 a.m. UTC | #4
On 2019/9/23 14:33, Steve French wrote:
> The code to call SMB2_change_notify (from an ioctl) should make it in
> pretty soon (let's hope we can finish testing it this  week).   The
> fix to inotify to allow inotify to call into a network file system
> will be helpful in the long run, but in the short term at least a GUI
> should be able to call into a cifs.ko specific ioctl soon for it.
Thus SMB2_notify_init should be static? I send a patch later?
>
> On Mon, Sep 23, 2019 at 1:08 AM zhengbin (A) <zhengbin13@huawei.com> wrote:
>>
>> On 2019/9/23 13:07, Steve French wrote:
>>> Thanks - merged into cifs-2.6.git for-next
>>>
>>> Aurélien -
>>> FYI - it makes minor update to code you changed to remove the warning.
>> We have a similar warning in fs/cifs/smb2pdu.c
>>
>> fs/cifs/smb2pdu.c:3184:1: warning: symbol 'SMB2_notify_init' was not declared. Should it be static?
>> fs/cifs/smb2pdu.c:3213:1: warning: symbol 'SMB2_change_notify' was not declared. Should it be static?
>>
>>
>> while these two functions are introduced by commit af8d46ab49b8
>>
>> ("smb3: add missing worker function for SMB3 change notify"). SMB2_notify_init is called by SMB2_change_notify
>>
>> No one calls  SMB2_change_notify? Or we will call SMB2_change_notify in the future?
>>
>>>
>>> On Sun, Sep 22, 2019 at 2:13 PM zhengbin <zhengbin13@huawei.com> wrote:
>>>> Fix sparse warnings:
>>>>
>>>> fs/cifs/smb2transport.c:52:1: warning: symbol 'smb3_crypto_shash_allocate' was not declared. Should it be static?
>>>> fs/cifs/smb2transport.c:101:4: warning: symbol 'smb2_find_chan_signkey' was not declared. Should it be static?
>>>> fs/cifs/smb2transport.c:121:17: warning: symbol 'smb2_find_global_smb_ses' was not declared. Should it be static?
>>>>
>>>> Reported-by: Hulk Robot <hulkci@huawei.com>
>>>> Signed-off-by: zhengbin <zhengbin13@huawei.com>
>>>> ---
>>>>  fs/cifs/smb2transport.c | 7 ++++---
>>>>  1 file changed, 4 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
>>>> index 12988df..7cc8641 100644
>>>> --- a/fs/cifs/smb2transport.c
>>>> +++ b/fs/cifs/smb2transport.c
>>>> @@ -48,7 +48,7 @@ smb2_crypto_shash_allocate(struct TCP_Server_Info *server)
>>>>                                &server->secmech.sdeschmacsha256);
>>>>  }
>>>>
>>>> -int
>>>> +static int
>>>>  smb3_crypto_shash_allocate(struct TCP_Server_Info *server)
>>>>  {
>>>>         struct cifs_secmech *p = &server->secmech;
>>>> @@ -98,7 +98,8 @@ smb311_crypto_shash_allocate(struct TCP_Server_Info *server)
>>>>         return rc;
>>>>  }
>>>>
>>>> -u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>>>> +static u8 *
>>>> +smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>>>>  {
>>>>         int i;
>>>>         struct cifs_chan *chan;
>>>> @@ -118,7 +119,7 @@ u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
>>>>         return NULL;
>>>>  }
>>>>
>>>> -struct cifs_ses *
>>>> +static struct cifs_ses *
>>>>  smb2_find_global_smb_ses(__u64 ses_id)
>>>>  {
>>>>         struct TCP_Server_Info *server;
>>>> --
>>>> 2.7.4
>>>>
>
Steve French Sept. 23, 2019, 6:52 a.m. UTC | #5
Yes - notify init should be static - but not SMB2_notify

On Mon, Sep 23, 2019 at 1:48 AM zhengbin (A) <zhengbin13@huawei.com> wrote:
>
>
> On 2019/9/23 14:33, Steve French wrote:
> > The code to call SMB2_change_notify (from an ioctl) should make it in
> > pretty soon (let's hope we can finish testing it this  week).   The
> > fix to inotify to allow inotify to call into a network file system
> > will be helpful in the long run, but in the short term at least a GUI
> > should be able to call into a cifs.ko specific ioctl soon for it.
> Thus SMB2_notify_init should be static? I send a patch later?
> >
> > On Mon, Sep 23, 2019 at 1:08 AM zhengbin (A) <zhengbin13@huawei.com> wrote:
> >>
> >> On 2019/9/23 13:07, Steve French wrote:
> >>> Thanks - merged into cifs-2.6.git for-next
> >>>
> >>> Aurélien -
> >>> FYI - it makes minor update to code you changed to remove the warning.
> >> We have a similar warning in fs/cifs/smb2pdu.c
> >>
> >> fs/cifs/smb2pdu.c:3184:1: warning: symbol 'SMB2_notify_init' was not declared. Should it be static?
> >> fs/cifs/smb2pdu.c:3213:1: warning: symbol 'SMB2_change_notify' was not declared. Should it be static?
> >>
> >>
> >> while these two functions are introduced by commit af8d46ab49b8
> >>
> >> ("smb3: add missing worker function for SMB3 change notify"). SMB2_notify_init is called by SMB2_change_notify
> >>
> >> No one calls  SMB2_change_notify? Or we will call SMB2_change_notify in the future?
> >>
> >>>
> >>> On Sun, Sep 22, 2019 at 2:13 PM zhengbin <zhengbin13@huawei.com> wrote:
> >>>> Fix sparse warnings:
> >>>>
> >>>> fs/cifs/smb2transport.c:52:1: warning: symbol 'smb3_crypto_shash_allocate' was not declared. Should it be static?
> >>>> fs/cifs/smb2transport.c:101:4: warning: symbol 'smb2_find_chan_signkey' was not declared. Should it be static?
> >>>> fs/cifs/smb2transport.c:121:17: warning: symbol 'smb2_find_global_smb_ses' was not declared. Should it be static?
> >>>>
> >>>> Reported-by: Hulk Robot <hulkci@huawei.com>
> >>>> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> >>>> ---
> >>>>  fs/cifs/smb2transport.c | 7 ++++---
> >>>>  1 file changed, 4 insertions(+), 3 deletions(-)
> >>>>
> >>>> diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
> >>>> index 12988df..7cc8641 100644
> >>>> --- a/fs/cifs/smb2transport.c
> >>>> +++ b/fs/cifs/smb2transport.c
> >>>> @@ -48,7 +48,7 @@ smb2_crypto_shash_allocate(struct TCP_Server_Info *server)
> >>>>                                &server->secmech.sdeschmacsha256);
> >>>>  }
> >>>>
> >>>> -int
> >>>> +static int
> >>>>  smb3_crypto_shash_allocate(struct TCP_Server_Info *server)
> >>>>  {
> >>>>         struct cifs_secmech *p = &server->secmech;
> >>>> @@ -98,7 +98,8 @@ smb311_crypto_shash_allocate(struct TCP_Server_Info *server)
> >>>>         return rc;
> >>>>  }
> >>>>
> >>>> -u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> >>>> +static u8 *
> >>>> +smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> >>>>  {
> >>>>         int i;
> >>>>         struct cifs_chan *chan;
> >>>> @@ -118,7 +119,7 @@ u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
> >>>>         return NULL;
> >>>>  }
> >>>>
> >>>> -struct cifs_ses *
> >>>> +static struct cifs_ses *
> >>>>  smb2_find_global_smb_ses(__u64 ses_id)
> >>>>  {
> >>>>         struct TCP_Server_Info *server;
> >>>> --
> >>>> 2.7.4
> >>>>
> >
>

Patch
diff mbox series

diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
index 12988df..7cc8641 100644
--- a/fs/cifs/smb2transport.c
+++ b/fs/cifs/smb2transport.c
@@ -48,7 +48,7 @@  smb2_crypto_shash_allocate(struct TCP_Server_Info *server)
 			       &server->secmech.sdeschmacsha256);
 }

-int
+static int
 smb3_crypto_shash_allocate(struct TCP_Server_Info *server)
 {
 	struct cifs_secmech *p = &server->secmech;
@@ -98,7 +98,8 @@  smb311_crypto_shash_allocate(struct TCP_Server_Info *server)
 	return rc;
 }

-u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
+static u8 *
+smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
 {
 	int i;
 	struct cifs_chan *chan;
@@ -118,7 +119,7 @@  u8 *smb2_find_chan_signkey(struct cifs_ses *ses, struct TCP_Server_Info *server)
 	return NULL;
 }

-struct cifs_ses *
+static struct cifs_ses *
 smb2_find_global_smb_ses(__u64 ses_id)
 {
 	struct TCP_Server_Info *server;