diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-02-20 16:11:05 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:00 -0400 |
| commit | 6885f308b557020efce6ef9c1fcc96adaabecbb6 (patch) | |
| tree | 9570d312b770254a93560d55ac93f3ae0cbcd885 /fs/btrfs/super.c | |
| parent | e3fe4e7120bc753552b071773022efcff704e34b (diff) | |
| download | blackbird-op-linux-6885f308b557020efce6ef9c1fcc96adaabecbb6.tar.gz blackbird-op-linux-6885f308b557020efce6ef9c1fcc96adaabecbb6.zip | |
Btrfs: Misc 2.6.25 updates
Remove the btrfs read_inode method, and use save_mount_options
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index a46300c4753a..4423a91206a1 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -272,6 +272,11 @@ static int btrfs_fill_super(struct super_block * sb, void * data, int silent) sb->s_root = root_dentry; btrfs_transaction_queue_work(tree_root, HZ * 30); + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25) + save_mount_options(sb, data); +#endif + return 0; fail_close: @@ -462,9 +467,13 @@ static struct super_operations btrfs_super_ops = { .delete_inode = btrfs_delete_inode, .put_inode = btrfs_put_inode, .put_super = btrfs_put_super, - .read_inode = btrfs_read_locked_inode, .write_super = btrfs_write_super, .sync_fs = btrfs_sync_fs, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) + .read_inode = btrfs_read_locked_inode, +#else + .show_options = generic_show_options, +#endif .write_inode = btrfs_write_inode, .dirty_inode = btrfs_dirty_inode, .alloc_inode = btrfs_alloc_inode, |
