diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-24 16:00:58 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-24 16:00:58 +0200 |
| commit | 54bcf382daf08c1396edb8b81e650b58930ccaef (patch) | |
| tree | 64b941f09489b5c9ee63e4ad43d736bfce911b21 /fs/btrfs/super.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | Btrfs: hash the btree inode during fill_super (diff) | |
| download | linux-54bcf382daf08c1396edb8b81e650b58930ccaef.tar.xz linux-54bcf382daf08c1396edb8b81e650b58930ccaef.zip | |
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) } static const struct super_operations btrfs_super_ops = { + .drop_inode = btrfs_drop_inode, .delete_inode = btrfs_delete_inode, .put_super = btrfs_put_super, .sync_fs = btrfs_sync_fs, |