From: Karel Zak <kzak@redhat.com>
Date: Fri, 30 Jun 2017 09:29:47 +0000 (+0200)
Subject: libfdisk: remove unnecessary fstat() call
X-Git-Tag: v2.31-rc1~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2db3cc4cf3245a3522911dfa2a0e569a249d11df;p=thirdparty%2Futil-linux.git

libfdisk: remove unnecessary fstat() call

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index 9d5492be73..e8dfa0e691 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -701,14 +701,14 @@ int fdisk_reassign_device(struct fdisk_context *cxt)
  */
 int fdisk_reread_partition_table(struct fdisk_context *cxt)
 {
-	int i;
-	struct stat statbuf;
+	int i = 0;
 
 	assert(cxt);
 	assert(cxt->dev_fd >= 0);
 
-	i = fstat(cxt->dev_fd, &statbuf);
-	if (i == 0 && S_ISBLK(statbuf.st_mode)) {
+	if (!S_ISBLK(cxt->dev_st.st_mode))
+		return 0;
+	else {
 		DBG(CXT, ul_debugobj(cxt, "calling re-read ioctl"));
 		sync();
 #ifdef BLKRRPART
@@ -732,6 +732,7 @@ int fdisk_reread_partition_table(struct fdisk_context *cxt)
 	return 0;
 }
 
+
 /**
  * fdisk_is_readonly:
  * @cxt: context