lkml.org 
[lkml]   [2012]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH -next] cifs: fix printk format warnings
From
Merged to cifs-2.6.git

On Tue, Jan 31, 2012 at 4:42 AM, Jeff Layton <jlayton@redhat.com> wrote:
> On Mon, 30 Jan 2012 19:50:01 -0800
> Randy Dunlap <rdunlap@xenotime.net> wrote:
>
>> From: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Fix printk format warnings for ssize_t variables:
>>
>> fs/cifs/connect.c:2145:3: warning: format '%ld' expects type 'long int', but argument 3 has type 'ssize_t'
>> fs/cifs/connect.c:2152:3: warning: format '%ld' expects type 'long int', but argument 3 has type 'ssize_t'
>> fs/cifs/connect.c:2160:3: warning: format '%ld' expects type 'long int', but argument 3 has type 'ssize_t'
>> fs/cifs/connect.c:2170:3: warning: format '%ld' expects type 'long int', but argument 3 has type 'ssize_t'
>>
>> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
>> Cc:   Steve French <sfrench@samba.org>
>> Cc:   linux-cifs@vger.kernel.org
>> ---
>>  fs/cifs/connect.c |    8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> --- linux-next-20120130.orig/fs/cifs/connect.c
>> +++ linux-next-20120130/fs/cifs/connect.c
>> @@ -2142,14 +2142,14 @@ cifs_set_cifscreds(struct smb_vol *vol,
>>
>>       len = delim - payload;
>>       if (len > MAX_USERNAME_SIZE || len <= 0) {
>> -             cFYI(1, "Bad value from username search (len=%ld)", len);
>> +             cFYI(1, "Bad value from username search (len=%zd)", len);
>>               rc = -EINVAL;
>>               goto out_key_put;
>>       }
>>
>>       vol->username = kstrndup(payload, len, GFP_KERNEL);
>>       if (!vol->username) {
>> -             cFYI(1, "Unable to allocate %ld bytes for username", len);
>> +             cFYI(1, "Unable to allocate %zd bytes for username", len);
>>               rc = -ENOMEM;
>>               goto out_key_put;
>>       }
>> @@ -2157,7 +2157,7 @@ cifs_set_cifscreds(struct smb_vol *vol,
>>
>>       len = key->datalen - (len + 1);
>>       if (len > MAX_PASSWORD_SIZE || len <= 0) {
>> -             cFYI(1, "Bad len for password search (len=%ld)", len);
>> +             cFYI(1, "Bad len for password search (len=%zd)", len);
>>               rc = -EINVAL;
>>               kfree(vol->username);
>>               vol->username = NULL;
>> @@ -2167,7 +2167,7 @@ cifs_set_cifscreds(struct smb_vol *vol,
>>       ++delim;
>>       vol->password = kstrndup(delim, len, GFP_KERNEL);
>>       if (!vol->password) {
>> -             cFYI(1, "Unable to allocate %ld bytes for password", len);
>> +             cFYI(1, "Unable to allocate %zd bytes for password", len);
>>               rc = -ENOMEM;
>>               kfree(vol->username);
>>               vol->username = NULL;
>
> Looks correct.
>
> Acked-by: Jeff Layton <jlayton@redhat.com>



--
Thanks,

Steve
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2012-01-31 14:45    [from the cache]
©2003-2011 Jasper Spaans