fs: cifs: cifsssmb: Change return type of convert_ace_to_cifs_ace
Subsystems (2)
PATCH 1/1 fs: cifs: cifsssmb: Change return type of convert_ace_to_cifs_ace
Change return from int to void of convert_ace_to_cifs_ace as it never fails.
fixes below issue reported by coccicheck fs/cifs/cifssmb.c:3606:7-9: Unneeded variable: "rc". Return "0" on line 3620
Signed-off-by Hariprasad Kelam <[email protected]>
--- fs/cifs/cifssmb.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
fs/cifs/cifssmb.c +3 -11
@@ -3600,11 +3600,9 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen,return size; } -static __u16 convert_ace_to_cifs_ace (struct cifs_posix_ace *cifs_ace, +static void convert_ace_to_cifs_ace (struct cifs_posix_ace *cifs_ace,const struct posix_acl_xattr_entry *local_ace) { -__u16 rc =0 ;/* 0 = ACL converted ok */ - cifs_ace->cifs_e_perm =le16_to_cpu (local_ace->e_perm); cifs_ace->cifs_e_tag =le16_to_cpu (local_ace->e_tag);/* BB is there a better way to handle the large uid? */
@@ -3617,7 +3615,6 @@ static __u16 convert_ace_to_cifs_ace(struct cifs_posix_ace *cifs_ace,cifs_dbg(FYI, "perm %d tag %d id %d\n", ace->e_perm, ace->e_tag, ace->e_id); */ -return rc; }/* Convert ACL from local Linux POSIX xattr to CIFS POSIX ACL wire format */
@@ -3653,13 +3650,8 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,cifs_dbg (FYI ,"unknown ACL type %d\n" , acl_type);return 0 ; } -for (i =0 ; i < count; i++) { - rc =convert_ace_to_cifs_ace (&cifs_acl->ace_array[i], &ace[i]); -if (rc !=0 ) { -/* ACE not converted */ -break ; - } - } +for (i =0 ; i < count; i++) +convert_ace_to_cifs_ace (&cifs_acl->ace_array[i], &ace[i]);if (rc ==0 ) { rc = (__u16)(count *sizeof (struct cifs_posix_ace )); rc +=sizeof (struct cifs_posix_acl );
Signature · 1 line
2.7.4
Steve French
Appliedmerged into cifs-2.6.git for-next
Quoted 57 lines · Hariprasad Kelam
Change return from int to void of
convert_ace_to_cifs_aceas it never fails.fixes below issue reported by coccicheck fs/cifs/cifssmb.c:3606:7-9: Unneeded variable: "rc". Return "0" on line 3620
Signed-off-by Hariprasad Kelam <[email protected]>--- fs/cifs/cifssmb.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)fs/cifs/cifssmb.c +3
-12@@ -3600,11 +3600,9 @@ static int cifs_copy_posix_acl(char *trgt, char *src, const int buflen,return size; } -static __u16 convert_ace_to_cifs_ace (struct cifs_posix_ace *cifs_ace, +static void convert_ace_to_cifs_ace (struct cifs_posix_ace *cifs_ace,const struct posix_acl_xattr_entry *local_ace) { -__u16 rc =0 ;/* 0 = ACL converted ok */ - cifs_ace->cifs_e_perm =le16_to_cpu (local_ace->e_perm); cifs_ace->cifs_e_tag =le16_to_cpu (local_ace->e_tag);/* BB is there a better way to handle the large uid? */ @@ -3617,7 +3615,6 @@ static __u16 convert_ace_to_cifs_ace(struct cifs_posix_ace *cifs_ace,cifs_dbg(FYI, "perm %d tag %d id %d\n", ace->e_perm, ace->e_tag, ace->e_id); */ -return rc; }/* Convert ACL from local Linux POSIX xattr to CIFS POSIX ACL wire format */ @@ -3653,13 +3650,8 @@ static __u16 ACL_to_cifs_posix(char *parm_data, const char *pACL,cifs_dbg (FYI ,"unknown ACL type %d\n" , acl_type);return 0 ; } -for (i =0 ; i < count; i++) { - rc =convert_ace_to_cifs_ace (&cifs_acl->ace_array[i], &ace[i]); -if (rc !=0 ) { -/* ACE not converted */ -break ; - } - } +for (i =0 ; i < count; i++) +convert_ace_to_cifs_ace (&cifs_acl->ace_array[i], &ace[i]);if (rc ==0 ) { rc = (__u16)(count *sizeof (struct cifs_posix_ace )); rc +=sizeof (struct cifs_posix_acl ); --2.7.4
Signature · 3 lines
Thanks, Steve