diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-24 10:00:58 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-24 10:00:58 -0400 |
| commit | 54bcf382daf08c1396edb8b81e650b58930ccaef (patch) | |
| tree | 64b941f09489b5c9ee63e4ad43d736bfce911b21 /fs/btrfs/super.c | |
| parent | 94a8d5caba74211ec76dac80fc6e2d5c391530df (diff) | |
| parent | c65ddb52dc412c9b67681b1aa16cd1bac8434e24 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/super.c
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 2db17cd66fc5..67035385444c 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c | |||
| @@ -676,6 +676,7 @@ static int btrfs_unfreeze(struct super_block *sb) | |||
| 676 | } | 676 | } |
| 677 | 677 | ||
| 678 | static const struct super_operations btrfs_super_ops = { | 678 | static const struct super_operations btrfs_super_ops = { |
| 679 | .drop_inode = btrfs_drop_inode, | ||
| 679 | .delete_inode = btrfs_delete_inode, | 680 | .delete_inode = btrfs_delete_inode, |
| 680 | .put_super = btrfs_put_super, | 681 | .put_super = btrfs_put_super, |
| 681 | .sync_fs = btrfs_sync_fs, | 682 | .sync_fs = btrfs_sync_fs, |