summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1998-12-21 04:14:24 +0000
committerRoland McGrath <roland@gnu.org>1998-12-21 04:14:24 +0000
commit1e0aba79db121c4db4a377517933eb70e0fdeadb (patch)
treed02272926c267f48ae25e94984ef1b973f4a29d1
parent67f110517e3e39ab196c88b724b23faed89628c8 (diff)
1998-12-20 Roland McGrath <roland@baalperazim.frob.com>
* inode.c (diskfs_write_disknode): Add braces to silence warning. * pager.c (file_pager_read_page): Likewise.
-rw-r--r--ext2fs/inode.c10
-rw-r--r--ext2fs/pager.c25
2 files changed, 20 insertions, 15 deletions
diff --git a/ext2fs/inode.c b/ext2fs/inode.c
index 68962037..92b00ad9 100644
--- a/ext2fs/inode.c
+++ b/ext2fs/inode.c
@@ -578,10 +578,12 @@ diskfs_write_disknode (struct node *np, int wait)
{
struct ext2_inode *di = write_node (np);
if (di)
- if (wait)
- sync_global_ptr (di, 1);
- else
- record_global_poke (di);
+ {
+ if (wait)
+ sync_global_ptr (di, 1);
+ else
+ record_global_poke (di);
+ }
}
/* Set *ST with appropriate values to reflect the current state of the
diff --git a/ext2fs/pager.c b/ext2fs/pager.c
index 1b3c3cdc..ff42ab63 100644
--- a/ext2fs/pager.c
+++ b/ext2fs/pager.c
@@ -180,17 +180,20 @@ file_pager_read_page (struct node *node, vm_offset_t page,
return EIO;
if (new_buf != *buf + offs)
- /* The read went into a different buffer than the one we passed. */
- if (offs == 0)
- /* First read, make the returned page be our buffer. */
- *buf = new_buf;
- else
- /* We've already got some buffer, so copy into it. */
- {
- bcopy (new_buf, *buf + offs, new_len);
- free_page_buf (new_buf); /* Return NEW_BUF to our pool. */
- STAT_INC (file_pagein_freed_bufs);
- }
+ {
+ /* The read went into a different buffer than the one we
+ passed. */
+ if (offs == 0)
+ /* First read, make the returned page be our buffer. */
+ *buf = new_buf;
+ else
+ /* We've already got some buffer, so copy into it. */
+ {
+ bcopy (new_buf, *buf + offs, new_len);
+ free_page_buf (new_buf); /* Return NEW_BUF to our pool. */
+ STAT_INC (file_pagein_freed_bufs);
+ }
+ }
offs += new_len;
num_pending_blocks = 0;