From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Elyes Haouas <ehaouas@noos.fr>

Date: Fri, 4 Mar 2022 07:41:59 +0100

Subject: [PATCH] fs: Remove trailing whitespaces

Signed-off-by: Elyes Haouas <ehaouas@noos.fr>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

---

 grub-core/fs/affs.c             |   4 +-

 grub-core/fs/archelp.c          |   4 +-

 grub-core/fs/bfs.c              |  10 +-

 grub-core/fs/cpio_common.c      |   2 +-

 grub-core/fs/fat.c              |   6 +-

 grub-core/fs/fshelp.c           |   6 +-

 grub-core/fs/hfs.c              |  14 +--

 grub-core/fs/hfsplus.c          |   8 +-

 grub-core/fs/hfspluscomp.c      |   6 +-

 grub-core/fs/iso9660.c          |  12 +--

 grub-core/fs/minix.c            |   6 +-

 grub-core/fs/nilfs2.c           |   8 +-

 grub-core/fs/ntfs.c             |   8 +-

 grub-core/fs/reiserfs.c         |   2 +-

 grub-core/fs/romfs.c            |   8 +-

 grub-core/fs/squash4.c          |  26 ++---

 grub-core/fs/udf.c              |   2 +-

 grub-core/fs/ufs.c              |   4 +-

 grub-core/fs/xfs.c              |   2 +-

 grub-core/fs/zfs/zfs.c          | 224 ++++++++++++++++++++--------------------

 grub-core/fs/zfs/zfs_fletcher.c |  12 +--

 grub-core/fs/zfs/zfs_sha256.c   |  14 +--

 grub-core/fs/zfs/zfscrypt.c     |  14 +--

 23 files changed, 201 insertions(+), 201 deletions(-)

diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c

index cafcd0fba916..0d90e9d1a895 100644

--- a/grub-core/fs/affs.c

+++ b/grub-core/fs/affs.c

@@ -345,7 +345,7 @@ grub_affs_create_node (grub_fshelp_node_t dir,

   if (len > sizeof (fil->name))

     len = sizeof (fil->name);

   *grub_latin1_to_utf8 (name_u8, fil->name, len) = '\0';

-  

+

   (*node)->di = *fil;

   for (nest = 0; nest < 8; nest++)

     {

@@ -408,7 +408,7 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,

   node = orig_node = grub_zalloc (sizeof (*node));

   if (!node)

     return 1;

-    

+

   *node = *dir;

   if (hook (".", GRUB_FSHELP_DIR, node, hook_data))

     return 1;

diff --git a/grub-core/fs/archelp.c b/grub-core/fs/archelp.c

index 0cf544f6fdfe..998de88b865c 100644

--- a/grub-core/fs/archelp.c

+++ b/grub-core/fs/archelp.c

@@ -75,7 +75,7 @@ handle_symlink (struct grub_archelp_data *data,

       || !arcops->get_link_target)

     return GRUB_ERR_NONE;

   flen = grub_strlen (fn);

-  if (grub_memcmp (*name, fn, flen) != 0 

+  if (grub_memcmp (*name, fn, flen) != 0

       || ((*name)[flen] != 0 && (*name)[flen] != '/'))

     return GRUB_ERR_NONE;

   rest = *name + flen;

@@ -251,7 +251,7 @@ grub_archelp_open (struct grub_archelp_data *data,

       grub_uint32_t mode;

       grub_int32_t mtime;

       int restart;

-      

+

       if (arcops->find_file (data, &fn, &mtime, &mode))

 	goto fail;

diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c

index 47dbe2011a14..a75876010d30 100644

--- a/grub-core/fs/bfs.c

+++ b/grub-core/fs/bfs.c

@@ -530,13 +530,13 @@ iterate_in_b_tree (grub_disk_t disk,

       err = read_b_node (disk, sb, ino,

 			 node_off,

 			 &node,

-			 &key_data, 

+			 &key_data,

 			 &keylen_idx,

 			 &key_values);

       if (err)

 	return 0;

-      

+

       for (i = 0; i < grub_bfs_to_cpu_treehead (node->count_keys); i++)

 	{

 	  char c;

@@ -682,7 +682,7 @@ find_in_b_tree (grub_disk_t disk,

 		level--;

 		grub_free (node);

 		continue;

-	      }	      

+	      }

 	  }

 	else if (level != 0

 		 && i + 1 < grub_bfs_to_cpu_treehead (node->count_keys))

@@ -827,7 +827,7 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb)

   grub_err_t err;

   err = grub_disk_read (disk, SUPERBLOCK, 0, sizeof (*sb), sb);

   if (err == GRUB_ERR_OUT_OF_RANGE)

-    return grub_error (GRUB_ERR_BAD_FS, 

+    return grub_error (GRUB_ERR_BAD_FS,

 #ifdef MODE_AFS

 		       "not an AFS filesystem"

 #else

@@ -843,7 +843,7 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb)

       || (grub_bfs_to_cpu32 (sb->bsize)

 	  != (1U << grub_bfs_to_cpu32 (sb->log2_bsize)))

       || grub_bfs_to_cpu32 (sb->log2_bsize) < GRUB_DISK_SECTOR_BITS)

-    return grub_error (GRUB_ERR_BAD_FS, 

+    return grub_error (GRUB_ERR_BAD_FS,

 #ifdef MODE_AFS

 		       "not an AFS filesystem"

 #else

diff --git a/grub-core/fs/cpio_common.c b/grub-core/fs/cpio_common.c

index 4e885d62313e..5d41b6fdbe1c 100644

--- a/grub-core/fs/cpio_common.c

+++ b/grub-core/fs/cpio_common.c

@@ -117,7 +117,7 @@ grub_cpio_get_link_target (struct grub_archelp_data *data)

   if (!ret)

     return NULL;

-  err = grub_disk_read (data->disk, 0, data->dofs, data->size, 

+  err = grub_disk_read (data->disk, 0, data->dofs, data->size,

 			ret);

   if (err)

     {

diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c

index ff6200c5be5d..c5efed724124 100644

--- a/grub-core/fs/fat.c

+++ b/grub-core/fs/fat.c

@@ -246,7 +246,7 @@ grub_fat_mount (grub_disk_t disk)

 #ifdef MODE_EXFAT

   if (grub_memcmp ((const char *) bpb.oem_name, "EXFAT   ",

 		   sizeof (bpb.oem_name)) != 0)

-    goto fail;    

+    goto fail;

 #endif

   /* Get the sizes of logical sectors and clusters.  */

@@ -321,7 +321,7 @@ grub_fat_mount (grub_disk_t disk)

 #endif

 #ifdef MODE_EXFAT

-  data->cluster_sector = (grub_le_to_cpu32 (bpb.cluster_offset) 

+  data->cluster_sector = (grub_le_to_cpu32 (bpb.cluster_offset)

 			  << data->logical_sector_bits);

   data->num_clusters = (grub_le_to_cpu32 (bpb.cluster_count)

 			  << data->logical_sector_bits);

@@ -694,7 +694,7 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node,

 		  {

 		    int j;

 		    for (j = 0; j < 15; j++)

-		      ctxt->unibuf[slots * 15 + j] 

+		      ctxt->unibuf[slots * 15 + j]

 			= grub_le_to_cpu16 (sec.type_specific.file_name.str[j]);

 		    slots++;

 		  }

diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c

index a2d0d297a520..cb41934b4fec 100644

--- a/grub-core/fs/fshelp.c

+++ b/grub-core/fs/fshelp.c

@@ -215,7 +215,7 @@ find_file (char *currpath,

 	break;

       push_node (ctx, foundnode, foundtype);

- 

+

       /* Read in the symlink and follow it.  */

       if (ctx->currnode->type == GRUB_FSHELP_SYMLINK)

 	{

@@ -326,7 +326,7 @@ grub_fshelp_find_file (const char *path, grub_fshelp_node_t rootnode,

 		       enum grub_fshelp_filetype expecttype)

 {

   return grub_fshelp_find_file_real (path, rootnode, foundnode,

-				     iterate_dir, NULL, 

+				     iterate_dir, NULL,

 				     read_symlink, expecttype);

 }

@@ -339,7 +339,7 @@ grub_fshelp_find_file_lookup (const char *path, grub_fshelp_node_t rootnode,

 			      enum grub_fshelp_filetype expecttype)

 {

   return grub_fshelp_find_file_real (path, rootnode, foundnode,

-				     NULL, lookup_file, 

+				     NULL, lookup_file,

 				     read_symlink, expecttype);

 }

diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c

index f419965d154f..91dc0e69c3de 100644

--- a/grub-core/fs/hfs.c

+++ b/grub-core/fs/hfs.c

@@ -883,7 +883,7 @@ grub_hfs_iterate_dir_it_dir (struct grub_hfs_node *hnd __attribute ((unused)),

 {

   struct grub_hfs_catalog_key *ckey = rec->key;

   struct grub_hfs_iterate_dir_node_found_ctx *ctx = hook_arg;

-  

+

   /* Stop when the entries do not match anymore.  */

   if (ckey->parent_dir != ctx->dir_be)

     return 1;

@@ -1077,7 +1077,7 @@ macroman_to_utf8 (char *to, const grub_uint8_t *from, grub_size_t len,

 	{

 	  *optr++ = ':';

 	  continue;

-	}	

+	}

       if (!(*iptr & 0x80))

 	{

 	  *optr++ = *iptr;

@@ -1094,7 +1094,7 @@ utf8_to_macroman (grub_uint8_t *to, const char *from)

   grub_uint8_t *end = to + 31;

   grub_uint8_t *optr = to;

   const char *iptr = from;

-  

+

   while (*iptr && optr < end)

     {

       int i, clen;

@@ -1104,7 +1104,7 @@ utf8_to_macroman (grub_uint8_t *to, const char *from)

 	  *optr++ = '/';

 	  iptr++;

 	  continue;

-	}	

+	}

       if (!(*iptr & 0x80))

 	{

 	  *optr++ = *iptr++;

@@ -1165,7 +1165,7 @@ lookup_file (grub_fshelp_node_t dir,

   *foundnode = grub_malloc (sizeof (struct grub_fshelp_node));

   if (!*foundnode)

     return grub_errno;

-  

+

   (*foundnode)->inode = grub_be_to_cpu32 (fdrec.dir.dirid);

   (*foundnode)->fdrec = fdrec;

   (*foundnode)->data = dir->data;

@@ -1266,7 +1266,7 @@ grub_hfs_dir (grub_device_t device, const char *path, grub_fs_dir_hook_t hook,

       .hook_data = hook_data

     };

   grub_fshelp_node_t found = NULL;

-  

+

   grub_dl_ref (my_mod);

   data = grub_hfs_mount (device->disk);

@@ -1295,7 +1295,7 @@ grub_hfs_open (struct grub_file *file, const char *name)

 {

   struct grub_hfs_data *data;

   grub_fshelp_node_t found = NULL;

-  

+

   grub_dl_ref (my_mod);

   data = grub_hfs_mount (file->device->disk);

diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c

index 19c7b3367987..6337cbfcbec6 100644

--- a/grub-core/fs/hfsplus.c

+++ b/grub-core/fs/hfsplus.c

@@ -19,7 +19,7 @@

 /* HFS+ is documented at http://developer.apple.com/technotes/tn/tn1150.html */

-#define grub_fshelp_node grub_hfsplus_file 

+#define grub_fshelp_node grub_hfsplus_file

 #include <grub/err.h>

 #include <grub/file.h>

 #include <grub/mm.h>

@@ -146,7 +146,7 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)

 {

   struct grub_hfsplus_btnode *nnode = 0;

   grub_disk_addr_t blksleft = fileblock;

-  struct grub_hfsplus_extent *extents = node->compressed 

+  struct grub_hfsplus_extent *extents = node->compressed

     ? &node->resource_extents[0] : &node->extents[0];

   while (1)

@@ -477,7 +477,7 @@ grub_hfsplus_cmp_extkey (struct grub_hfsplus_key *keya,

   if (extkey_a->type < extkey_b->type)

     return -1;

-  

+

   akey = grub_be_to_cpu32 (extkey_a->start);

   if (akey > extkey_b->start)

     return 1;

@@ -568,7 +568,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,

 			   struct grub_hfsplus_key_internal *key,

 			   int (*compare_keys) (struct grub_hfsplus_key *keya,

 						struct grub_hfsplus_key_internal *keyb),

-			   struct grub_hfsplus_btnode **matchnode, 

+			   struct grub_hfsplus_btnode **matchnode,

 			   grub_off_t *keyoffset)

 {

   grub_uint64_t currnode;

diff --git a/grub-core/fs/hfspluscomp.c b/grub-core/fs/hfspluscomp.c

index d76f3f137a92..095ea48c9a62 100644

--- a/grub-core/fs/hfspluscomp.c

+++ b/grub-core/fs/hfspluscomp.c

@@ -179,7 +179,7 @@ hfsplus_read_compressed_real (struct grub_hfsplus_file *node,

   return len0;

 }

-static grub_err_t 

+static grub_err_t

 hfsplus_open_compressed_real (struct grub_hfsplus_file *node)

 {

   grub_err_t err;

@@ -306,8 +306,8 @@ hfsplus_open_compressed_real (struct grub_hfsplus_file *node)

 GRUB_MOD_INIT(hfspluscomp)

 {

-  grub_hfsplus_open_compressed = hfsplus_open_compressed_real;  

-  grub_hfsplus_read_compressed = hfsplus_read_compressed_real;  

+  grub_hfsplus_open_compressed = hfsplus_open_compressed_real;

+  grub_hfsplus_read_compressed = hfsplus_read_compressed_real;

 }

 GRUB_MOD_FINI(hfspluscomp)

diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c

index ac011950a64f..91817ec1f5ad 100644

--- a/grub-core/fs/iso9660.c

+++ b/grub-core/fs/iso9660.c

@@ -181,7 +181,7 @@ static grub_err_t

 iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int64_t *nix)

 {

   struct grub_datetime datetime;

-  

+

   if (! i->year[0] && ! i->year[1]

       && ! i->year[2] && ! i->year[3]

       && ! i->month[0] && ! i->month[1]

@@ -198,7 +198,7 @@ iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int64_t *nix)

   datetime.hour = (i->hour[0] - '0') * 10 + (i->hour[1] - '0');

   datetime.minute = (i->minute[0] - '0') * 10 + (i->minute[1] - '0');

   datetime.second = (i->second[0] - '0') * 10 + (i->second[1] - '0');

-  

+

   if (!grub_datetime2unixtime (&datetime, nix))

     return grub_error (GRUB_ERR_BAD_NUMBER, "incorrect date");

   *nix -= i->offset * 60 * 15;

@@ -216,7 +216,7 @@ iso9660_to_unixtime2 (const struct grub_iso9660_date2 *i, grub_int64_t *nix)

   datetime.hour = i->hour;

   datetime.minute = i->minute;

   datetime.second = i->second;

-  

+

   if (!grub_datetime2unixtime (&datetime, nix))

     return 0;

   *nix -= i->offset * 60 * 15;

@@ -499,7 +499,7 @@ grub_iso9660_mount (grub_disk_t disk)

 static char *

 grub_iso9660_read_symlink (grub_fshelp_node_t node)

 {

-  return node->have_symlink 

+  return node->have_symlink

     ? grub_strdup (node->symlink

 		   + (node->have_dirents) * sizeof (node->dirents[0])

 		   - sizeof (node->dirents)) : grub_strdup ("");

@@ -549,7 +549,7 @@ add_part (struct iterate_dir_ctx *ctx,

   ctx->symlink = new;

   grub_memcpy (ctx->symlink + size, part, len2);

-  ctx->symlink[size + len2] = 0;  

+  ctx->symlink[size + len2] = 0;

 }

 static grub_err_t

@@ -1106,7 +1106,7 @@ grub_iso9660_uuid (grub_device_t device, char **uuid)

 }

 /* Get writing time of filesystem. */

-static grub_err_t 

+static grub_err_t

 grub_iso9660_mtime (grub_device_t device, grub_int64_t *timebuf)

 {

   struct grub_iso9660_data *data;

diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c

index 3cd18c85b302..953df11916b8 100644

--- a/grub-core/fs/minix.c

+++ b/grub-core/fs/minix.c

@@ -98,10 +98,10 @@ struct grub_minix_sblock

   grub_uint32_t max_file_size;

   grub_uint32_t zones;

   grub_uint16_t magic;

-  

+

   grub_uint16_t pad2;

   grub_uint16_t block_size;

-  grub_uint8_t disk_version; 

+  grub_uint8_t disk_version;

 };

 #else

 struct grub_minix_sblock

@@ -351,7 +351,7 @@ grub_minix_read_inode (struct grub_minix_data *data, grub_minix_ino_t ino)

   int offs = (ino % (GRUB_DISK_SECTOR_SIZE

 		     / sizeof (struct grub_minix_inode))

 	      * sizeof (struct grub_minix_inode));

-  

+

   grub_disk_read (data->disk, block, offs,

 		  sizeof (struct grub_minix_inode), &data->inode);

diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c

index 3c248a910b42..fc7374ead490 100644

--- a/grub-core/fs/nilfs2.c

+++ b/grub-core/fs/nilfs2.c

@@ -1,5 +1,5 @@

-/* 

- *  nilfs2.c - New Implementation of Log filesystem 

+/*

+ *  nilfs2.c - New Implementation of Log filesystem

  *

  *  Written by Jiro SEKIBA <jir@unicus.jp>

  *

@@ -680,12 +680,12 @@ grub_nilfs2_read_checkpoint (struct grub_nilfs2_data *data,

   grub_disk_t disk = data->disk;

   unsigned int nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));

-  /* Assume sizeof(struct grub_nilfs2_cpfile_header) < 

+  /* Assume sizeof(struct grub_nilfs2_cpfile_header) <

      sizeof(struct grub_nilfs2_checkpoint).

    */

   blockno = grub_divmod64 (cpno, NILFS2_BLOCK_SIZE (data) /

                           sizeof (struct grub_nilfs2_checkpoint), &offset);

-  

+

   pptr = grub_nilfs2_bmap_lookup (data, &data->sroot.sr_cpfile, blockno, 1);

   if (pptr == (grub_uint64_t) - 1)

     {

diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c

index 2f34f76da88c..3511e4e2cb6f 100644

--- a/grub-core/fs/ntfs.c

+++ b/grub-core/fs/ntfs.c

@@ -17,7 +17,7 @@

  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */

-#define grub_fshelp_node grub_ntfs_file 

+#define grub_fshelp_node grub_ntfs_file

 #include <grub/file.h>

 #include <grub/mm.h>

@@ -32,7 +32,7 @@ GRUB_MOD_LICENSE ("GPLv3+");

 static grub_dl_t my_mod;

-#define grub_fshelp_node grub_ntfs_file 

+#define grub_fshelp_node grub_ntfs_file

 static inline grub_uint16_t

 u16at (void *ptr, grub_size_t ofs)

@@ -725,7 +725,7 @@ grub_ntfs_read_symlink (grub_fshelp_node_t node)

       && grub_isalpha (buf[4]))

     {

       grub_memmove (buf, buf + 6, end - buf + 1 - 6);

-      end -= 6; 

+      end -= 6;

     }

   return buf;

 }

@@ -992,7 +992,7 @@ grub_ntfs_dir_iter (const char *filename, enum grub_fshelp_filetype filetype,

   grub_memset (&info, 0, sizeof (info));

   info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);

   info.mtimeset = 1;

-  info.mtime = grub_divmod64 (node->mtime, 10000000, 0) 

+  info.mtime = grub_divmod64 (node->mtime, 10000000, 0)

     - 86400ULL * 365 * (1970 - 1601)

     - 86400ULL * ((1970 - 1601) / 4) + 86400ULL * ((1970 - 1601) / 100);

   grub_free (node);

diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c

index b8253da7fed2..42818c376229 100644

--- a/grub-core/fs/reiserfs.c

+++ b/grub-core/fs/reiserfs.c

@@ -775,7 +775,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,

 	  char *entry_name;

 	  char *entry_name_end = 0;

 	  char c;

-	  

+

           if (!(entry_state & GRUB_REISERFS_VISIBLE_MASK))

 	    continue;

diff --git a/grub-core/fs/romfs.c b/grub-core/fs/romfs.c

index d97b8fbb8c36..1f7dcfca1d3a 100644

--- a/grub-core/fs/romfs.c

+++ b/grub-core/fs/romfs.c

@@ -112,7 +112,7 @@ grub_romfs_mount (grub_device_t dev)

     {

       grub_error (GRUB_ERR_BAD_FS, "not romfs");

       return NULL;

-    }    

+    }

   err = do_checksum (&sb, sizeof (sb) < grub_be_to_cpu32 (sb.sb.total_size) ?

 		     sizeof (sb) : grub_be_to_cpu32 (sb.sb.total_size));

   if (err)

@@ -271,7 +271,7 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir,

 		while (1)

 		  {

 		    char buf[16];

-		    err = grub_disk_read (dir->data->disk, 

+		    err = grub_disk_read (dir->data->disk,

 					  laddr >> GRUB_DISK_SECTOR_BITS,

 					  laddr & (GRUB_DISK_SECTOR_SIZE - 1),

 					  16, buf);

@@ -298,7 +298,7 @@ grub_romfs_iterate_dir (grub_fshelp_node_t dir,

 		node->data_addr = grub_be_to_cpu32 (node->file.spec);

 		filetype = GRUB_FSHELP_DIR;

 	      }

-	    

+

 	    break;

 	  }

 	}

@@ -402,7 +402,7 @@ grub_romfs_read (grub_file_t file, char *buf, grub_size_t len)

   data->data->disk->read_hook_data = file->read_hook_data;

   grub_disk_read (data->data->disk,

 		  (data->data_addr + file->offset) >> GRUB_DISK_SECTOR_BITS,

-		  (data->data_addr + file->offset) & (GRUB_DISK_SECTOR_SIZE - 1),		  

+		  (data->data_addr + file->offset) & (GRUB_DISK_SECTOR_SIZE - 1),

 		  len, buf);

   data->data->disk->read_hook = NULL;

diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c

index 6dd731e231ee..02b1f9b6d101 100644

--- a/grub-core/fs/squash4.c

+++ b/grub-core/fs/squash4.c

@@ -210,7 +210,7 @@ struct grub_fshelp_node

   struct grub_squash_data *data;

   struct grub_squash_inode ino;

   grub_size_t stsize;

-  struct 

+  struct

   {

     grub_disk_addr_t ino_chunk;

     grub_uint16_t ino_offset;

@@ -243,7 +243,7 @@ read_chunk (struct grub_squash_data *data, void *buf, grub_size_t len,

       csize = SQUASH_CHUNK_SIZE - offset;

       if (csize > len)

 	csize = len;

-  

+

       if (grub_le_to_cpu16 (d) & SQUASH_CHUNK_UNCOMPRESSED)

 	{

 	  grub_disk_addr_t a = chunk_start + 2 + offset;

@@ -256,7 +256,7 @@ read_chunk (struct grub_squash_data *data, void *buf, grub_size_t len,

       else

 	{

 	  char *tmp;

-	  grub_size_t bsize = grub_le_to_cpu16 (d) & ~SQUASH_CHUNK_FLAGS; 

+	  grub_size_t bsize = grub_le_to_cpu16 (d) & ~SQUASH_CHUNK_FLAGS;

 	  grub_disk_addr_t a = chunk_start + 2;

 	  tmp = grub_malloc (bsize);

 	  if (!tmp)

@@ -339,7 +339,7 @@ xz_decompress (char *inbuf, grub_size_t insize, grub_off_t off,

   while (len)

     {

       enum xz_ret xzret;

-      

+

       buf.out_pos = 0;

       xzret = xz_dec_run (data->xzdec, &buf;;

@@ -399,9 +399,9 @@ squash_mount (grub_disk_t disk)

       return NULL;

     }

-  err = grub_disk_read (disk, 

+  err = grub_disk_read (disk,

 			grub_le_to_cpu64 (sb.unk1offset)

-			>> GRUB_DISK_SECTOR_BITS, 

+			>> GRUB_DISK_SECTOR_BITS,

 			grub_le_to_cpu64 (sb.unk1offset)

 			& (GRUB_DISK_SECTOR_SIZE - 1), sizeof (frag), &frag;;

   if (grub_errno == GRUB_ERR_OUT_OF_RANGE)

@@ -448,7 +448,7 @@ squash_mount (grub_disk_t disk)

     }

   data->blksz = grub_le_to_cpu32 (data->sb.block_size);

-  for (data->log2_blksz = 0; 

+  for (data->log2_blksz = 0;

        (1U << data->log2_blksz) < data->blksz;

        data->log2_blksz++);

@@ -643,7 +643,7 @@ make_root_node (struct grub_squash_data *data, struct grub_fshelp_node *root)

   root->stack[0].ino_chunk = grub_le_to_cpu32 (data->sb.root_ino_chunk);

   root->stack[0].ino_offset = grub_cpu_to_le16 (data->sb.root_ino_offset);

  return read_chunk (data, &root->ino, sizeof (root->ino),

-		    grub_le_to_cpu64 (data->sb.inodeoffset) 

+		    grub_le_to_cpu64 (data->sb.inodeoffset)

 		    + root->stack[0].ino_chunk,

 		    root->stack[0].ino_offset);

 }

@@ -765,7 +765,7 @@ grub_squash_open (struct grub_file *file, const char *name)

 }

 static grub_ssize_t

-direct_read (struct grub_squash_data *data, 

+direct_read (struct grub_squash_data *data,

 	     struct grub_squash_cache_inode *ino,

 	     grub_off_t off, char *buf, grub_size_t len)

 {

@@ -882,7 +882,7 @@ direct_read (struct grub_squash_data *data,

 	  grub_free (block);

 	}

       else

-	err = grub_disk_read (data->disk, 

+	err = grub_disk_read (data->disk,

 			      (ino->cumulated_block_sizes[i] + a + boff)

 			      >> GRUB_DISK_SECTOR_BITS,

 			      (ino->cumulated_block_sizes[i] + a + boff)

@@ -946,7 +946,7 @@ grub_squash_read (grub_file_t file, char *buf, grub_size_t len)

     }

   else

     off -= direct_len;

- 

+

   err = read_chunk (data, &frag, sizeof (frag),

 		    data->fragments, sizeof (frag) * fragment);

   if (err)

@@ -957,7 +957,7 @@ grub_squash_read (grub_file_t file, char *buf, grub_size_t len)

     b = grub_le_to_cpu32 (ino->ino.long_file.offset) + off;

   else

     b = grub_le_to_cpu32 (ino->ino.file.offset) + off;

-  

+

   /* FIXME: cache uncompressed chunks.  */

   if (compressed)

     {

@@ -1013,7 +1013,7 @@ grub_squash_mtime (grub_device_t dev, grub_int64_t *tm)

   *tm = grub_le_to_cpu32 (data->sb.creation_time);

   squash_unmount (data);

   return GRUB_ERR_NONE;

-} 

+}

 static struct grub_fs grub_squash_fs =

   {

diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c

index 2ac5c1d0048f..5a665093ed77 100644

--- a/grub-core/fs/udf.c

+++ b/grub-core/fs/udf.c

@@ -567,7 +567,7 @@ grub_udf_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)

 		    (buf + sizeof (struct grub_udf_aed));

 	      continue;

 	    }

-	      

+

 	  if (filebytes < adlen)

 	    {

 	      grub_uint32_t ad_block_num = ad->block.block_num;

diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c

index 34a698b71b8d..a354c92d936a 100644

--- a/grub-core/fs/ufs.c

+++ b/grub-core/fs/ufs.c

@@ -568,7 +568,7 @@ grub_ufs_find_file (struct grub_ufs_data *data, const char *path)

 	    {

 	      dirino = data->ino;

 	      grub_ufs_read_inode (data, grub_ufs_to_cpu32 (dirent.ino), 0);

-	      

+

 	      if ((INODE_MODE(data) & GRUB_UFS_ATTR_TYPE)

 		  == GRUB_UFS_ATTR_LNK)

 		{

@@ -613,7 +613,7 @@ grub_ufs_mount (grub_disk_t disk)

 	  && ((data->sblock.bsize & (data->sblock.bsize - 1)) == 0)

 	  && data->sblock.ino_per_group != 0)

 	{

-	  for (data->log2_blksz = 0; 

+	  for (data->log2_blksz = 0;

 	       (1U << data->log2_blksz) < grub_ufs_to_cpu32 (data->sblock.bsize);

 	       data->log2_blksz++);

diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c

index e3816d1ec4a9..d6de7f1a2dd2 100644

--- a/grub-core/fs/xfs.c

+++ b/grub-core/fs/xfs.c

@@ -894,7 +894,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir,

 		   tag, which is not used by GRUB.  So it can be overwritten. */

 		filename[direntry->len] = '\0';

-		if (iterate_dir_call_hook (grub_be_to_cpu64(direntry->inode), 

+		if (iterate_dir_call_hook (grub_be_to_cpu64(direntry->inode),

 					   filename, &ctx))

 		  {

 		    grub_free (dirblock);

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c

index cf4d2ab189a5..5961818abc9a 100644

--- a/grub-core/fs/zfs/zfs.c

+++ b/grub-core/fs/zfs/zfs.c

@@ -176,7 +176,7 @@ typedef struct decomp_entry

 /*

  * Signature for checksum functions.

  */

-typedef void zio_checksum_t(const void *data, grub_uint64_t size, 

+typedef void zio_checksum_t(const void *data, grub_uint64_t size,

 			    grub_zfs_endian_t endian, zio_cksum_t *zcp);

 /*

@@ -297,7 +297,7 @@ check_feature(const char *name, grub_uint64_t val, struct grub_zfs_dir_ctx *ctx)

 static grub_err_t

 check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data );

-static grub_err_t 

+static grub_err_t