Commit 8c800656 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro

ufs: add ->sync_fs

Add a ->sync_fs method for data integrity syncs, and reimplement
->write_super ontop of it.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ad43ffde
...@@ -1125,7 +1125,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) ...@@ -1125,7 +1125,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
return -ENOMEM; return -ENOMEM;
} }
static void ufs_write_super(struct super_block *sb) static int ufs_sync_fs(struct super_block *sb, int wait)
{ {
struct ufs_sb_private_info * uspi; struct ufs_sb_private_info * uspi;
struct ufs_super_block_first * usb1; struct ufs_super_block_first * usb1;
...@@ -1134,25 +1134,36 @@ static void ufs_write_super(struct super_block *sb) ...@@ -1134,25 +1134,36 @@ static void ufs_write_super(struct super_block *sb)
lock_super(sb); lock_super(sb);
lock_kernel(); lock_kernel();
UFSD("ENTER\n"); UFSD("ENTER\n");
flags = UFS_SB(sb)->s_flags; flags = UFS_SB(sb)->s_flags;
uspi = UFS_SB(sb)->s_uspi; uspi = UFS_SB(sb)->s_uspi;
usb1 = ubh_get_usb_first(uspi); usb1 = ubh_get_usb_first(uspi);
usb3 = ubh_get_usb_third(uspi); usb3 = ubh_get_usb_third(uspi);
if (!(sb->s_flags & MS_RDONLY)) { usb1->fs_time = cpu_to_fs32(sb, get_seconds());
usb1->fs_time = cpu_to_fs32(sb, get_seconds()); if ((flags & UFS_ST_MASK) == UFS_ST_SUN ||
if ((flags & UFS_ST_MASK) == UFS_ST_SUN (flags & UFS_ST_MASK) == UFS_ST_SUNOS ||
|| (flags & UFS_ST_MASK) == UFS_ST_SUNOS (flags & UFS_ST_MASK) == UFS_ST_SUNx86)
|| (flags & UFS_ST_MASK) == UFS_ST_SUNx86) ufs_set_fs_state(sb, usb1, usb3,
ufs_set_fs_state(sb, usb1, usb3, UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time));
UFS_FSOK - fs32_to_cpu(sb, usb1->fs_time)); ufs_put_cstotal(sb);
ufs_put_cstotal(sb);
}
sb->s_dirt = 0; sb->s_dirt = 0;
UFSD("EXIT\n"); UFSD("EXIT\n");
unlock_kernel(); unlock_kernel();
unlock_super(sb); unlock_super(sb);
return 0;
}
static void ufs_write_super(struct super_block *sb)
{
if (!(sb->s_flags & MS_RDONLY))
ufs_sync_fs(sb, 1);
else
sb->s_dirt = 0;
} }
static void ufs_put_super(struct super_block *sb) static void ufs_put_super(struct super_block *sb)
...@@ -1381,6 +1392,7 @@ static const struct super_operations ufs_super_ops = { ...@@ -1381,6 +1392,7 @@ static const struct super_operations ufs_super_ops = {
.delete_inode = ufs_delete_inode, .delete_inode = ufs_delete_inode,
.put_super = ufs_put_super, .put_super = ufs_put_super,
.write_super = ufs_write_super, .write_super = ufs_write_super,
.sync_fs = ufs_sync_fs,
.statfs = ufs_statfs, .statfs = ufs_statfs,
.remount_fs = ufs_remount, .remount_fs = ufs_remount,
.show_options = ufs_show_options, .show_options = ufs_show_options,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment