Skip to contentSkip to conversation

fs: fat: avoid superfluous conversion calling set_cluster

PATCH New Heinrich Schuchardt 2 participants 2 messages Feb 14, 2018 – Feb 23, 2018 VFAT/FAT/msdos filesystem

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fs: fat: avoid superfluous conversion calling set_cluster

Parameter size of function set_cluster is of type unsigned long. It makes no sense to convert actsize to int before passing it to set_cluster as size. Let's use loff_t as type of parameter size to avoid any conversion.

---
v2
change type of parameter size

---
 fs/fat/fat_write.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
fs/fat/fat_write.c +3 -4
index 2b753df2820..270b2908acd 100644
@@ -494,8 +494,7 @@ static __u32 determine_fatent(fsdata *mydata, __u32 entry)
  * Return 0 on success, -1 otherwise.
  */
 static int
-set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer,
-	     unsigned long size)
+set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, loff_t size)
 {
 	__u32 idx = 0;
 	__u32 startsect;
@@ -679,7 +678,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
 
 		/* set remaining bytes */
 		actsize = filesize;
-		if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
+		if (set_cluster(mydata, curclust, buffer, actsize) != 0) {
 			debug("error: writing cluster\n");
 			return -1;
 		}
@@ -696,7 +695,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
 
 		return 0;
 getit:
-		if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
+		if (set_cluster(mydata, curclust, buffer, actsize) != 0) {
 			debug("error: writing cluster\n");
 			return -1;
 		}
Signature · 1 line
2.11.0
#1 lore raw

PATCH v2 1/1 fs: fat: avoid superfluous conversion calling set_cluster

Quoted 36 lines · Heinrich Schuchardt

Parameter size of function set_cluster is of type unsigned long. It makes no sense to convert actsize to int before passing it to set_cluster as size. Let's use loff_t as type of parameter size to avoid any conversion.

---
v2
change type of parameter size

---
 fs/fat/fat_write.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
fs/fat/fat_write.c +2 -3
index 2b753df2820..270b2908acd 100644
@@ -494,8 +494,7 @@ static __u32 determine_fatent(fsdata *mydata, __u32 entry)
  * Return 0 on success, -1 otherwise.
  */
 static int
-set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer,
-	     unsigned long size)
+set_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, loff_t size)
 {
 	__u32 idx = 0;
 	__u32 startsect;
@@ -679,7 +678,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
 
 		/* set remaining bytes */
 		actsize = filesize;
-		if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
+		if (set_cluster(mydata, curclust, buffer, actsize) != 0) {
 			debug("error: writing cluster\n");
 			return -1;
 		}

fs/fat/fat_write.c set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer, · line 701

Quoted 8 lines
fs/fat/fat_write.c +1 -1
@@ -696,7 +695,7 @@ set_contents(fsdata *mydata, dir_entry *dentptr, __u8 *buffer,
 
 		return 0;
 getit:
-		if (set_cluster(mydata, curclust, buffer, (int)actsize) != 0) {
+		if (set_cluster(mydata, curclust, buffer, actsize) != 0) {
 			debug("error: writing cluster\n");
 			return -1;
 		}

So, this introduces a bunch of build issues when using certain
toolchains (such as Debian's arm-linux-gnueabihf):
arm: + display5
+(display5) fs/built-in.o: In function `get_cluster':
+(display5) build/../fs/fat/fat.c:278: undefined reference to `__aeabi_ldivmod'
+(display5) arm-linux-gnueabihf-ld.bfd: BFD (GNU Binutils for Debian) 2.28 assertion fail ../../bfd/elf32-arm.c:9514 +(display5) make[1]: *** [u-boot] Error 1
+(display5) make: *** [sub-make] Error 2

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/5a48afc8/attachment.sig>