2 files changed, 1 insertions, 13 deletions

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index e28800a9f2b5..1418b916fc27 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -1501,7 +1501,7 @@ xfs_setsize_buftarg_early(
         struct block_device     *bdev)
 {
         return xfs_setsize_buftarg_flags(btp,
-                        PAGE_CACHE_SIZE, bdev_hardsect_size(bdev), 0);
+                        PAGE_CACHE_SIZE, bdev_logical_block_size(bdev), 0);
 }
 
 int
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 36fb8a657c55..2e09efbca8db 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1121,15 +1121,6 @@ xfs_fs_put_super(
         kfree(mp);
 }
 
-STATIC void
-xfs_fs_write_super(
-        struct super_block      *sb)
-{
-        if (!(sb->s_flags & MS_RDONLY))
-                xfs_sync_fsdata(XFS_M(sb), 0);
-        sb->s_dirt = 0;
-}
-
 STATIC int
 xfs_fs_sync_super(
         struct super_block      *sb,
@@ -1154,7 +1145,6 @@ xfs_fs_sync_super(
                 error = xfs_quiesce_data(mp);
         else
                 error = xfs_sync_fsdata(mp, 0);
-        sb->s_dirt = 0;
 
         if (unlikely(laptop_mode)) {
                 int     prev_sync_seq = mp->m_sync_seq;
@@ -1461,7 +1451,6 @@ xfs_fs_fill_super(
 
         XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, mtpt, mp->m_fsname);
 
-        sb->s_dirt = 1;
         sb->s_magic = XFS_SB_MAGIC;
         sb->s_blocksize = mp->m_sb.sb_blocksize;
         sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1;
@@ -1549,7 +1538,6 @@ static struct super_operations xfs_super_operations = {
         .write_inode            = xfs_fs_write_inode,
         .clear_inode            = xfs_fs_clear_inode,
         .put_super              = xfs_fs_put_super,
-        .write_super            = xfs_fs_write_super,
         .sync_fs                = xfs_fs_sync_super,
         .freeze_fs              = xfs_fs_freeze,
         .statfs                 = xfs_fs_statfs,