lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus

Browse Source 
Conflicts:
	fs/btrfs/super.c
This commit is contained in:
Chris Mason
2009-09-24 10:00:58 -04:00
parent 94a8d5caba c65ddb52dc
commit 54bcf382da
31 changed files with 2768 additions and 2009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/btrfs/super.c
View File

@ -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,