diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 11:02:03 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-12 11:02:03 -0400 |
commit | 82681a318f9f028ea64e61f24bbd9ac535531921 (patch) | |
tree | 529b6a5b4fd040fb54b7672b1a224ebd47445876 /fs/xfs/linux-2.6/xfs_super.c | |
parent | 3860c97bd60a4525bb62eb90e3e7d2f02662ac59 (diff) | |
parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) |
[SCSI] Merge branch 'linus'
Conflicts:
drivers/message/fusion/mptsas.c
fixed up conflict between req->data_len accessors and mptsas driver updates.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index bb685269f832..08d6bd9a3947 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -1104,15 +1104,6 @@ xfs_fs_put_super( | |||
1104 | kfree(mp); | 1104 | kfree(mp); |
1105 | } | 1105 | } |
1106 | 1106 | ||
1107 | STATIC void | ||
1108 | xfs_fs_write_super( | ||
1109 | struct super_block *sb) | ||
1110 | { | ||
1111 | if (!(sb->s_flags & MS_RDONLY)) | ||
1112 | xfs_sync_fsdata(XFS_M(sb), 0); | ||
1113 | sb->s_dirt = 0; | ||
1114 | } | ||
1115 | |||
1116 | STATIC int | 1107 | STATIC int |
1117 | xfs_fs_sync_super( | 1108 | xfs_fs_sync_super( |
1118 | struct super_block *sb, | 1109 | struct super_block *sb, |
@@ -1137,7 +1128,6 @@ xfs_fs_sync_super( | |||
1137 | error = xfs_quiesce_data(mp); | 1128 | error = xfs_quiesce_data(mp); |
1138 | else | 1129 | else |
1139 | error = xfs_sync_fsdata(mp, 0); | 1130 | error = xfs_sync_fsdata(mp, 0); |
1140 | sb->s_dirt = 0; | ||
1141 | 1131 | ||
1142 | if (unlikely(laptop_mode)) { | 1132 | if (unlikely(laptop_mode)) { |
1143 | int prev_sync_seq = mp->m_sync_seq; | 1133 | int prev_sync_seq = mp->m_sync_seq; |
@@ -1443,7 +1433,6 @@ xfs_fs_fill_super( | |||
1443 | 1433 | ||
1444 | XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, mtpt, mp->m_fsname); | 1434 | XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, mtpt, mp->m_fsname); |
1445 | 1435 | ||
1446 | sb->s_dirt = 1; | ||
1447 | sb->s_magic = XFS_SB_MAGIC; | 1436 | sb->s_magic = XFS_SB_MAGIC; |
1448 | sb->s_blocksize = mp->m_sb.sb_blocksize; | 1437 | sb->s_blocksize = mp->m_sb.sb_blocksize; |
1449 | sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; | 1438 | sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; |
@@ -1533,7 +1522,6 @@ static struct super_operations xfs_super_operations = { | |||
1533 | .write_inode = xfs_fs_write_inode, | 1522 | .write_inode = xfs_fs_write_inode, |
1534 | .clear_inode = xfs_fs_clear_inode, | 1523 | .clear_inode = xfs_fs_clear_inode, |
1535 | .put_super = xfs_fs_put_super, | 1524 | .put_super = xfs_fs_put_super, |
1536 | .write_super = xfs_fs_write_super, | ||
1537 | .sync_fs = xfs_fs_sync_super, | 1525 | .sync_fs = xfs_fs_sync_super, |
1538 | .freeze_fs = xfs_fs_freeze, | 1526 | .freeze_fs = xfs_fs_freeze, |
1539 | .statfs = xfs_fs_statfs, | 1527 | .statfs = xfs_fs_statfs, |