diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 18:24:04 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 18:24:04 +0200 |
commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /fs/afs/super.c | |
parent | Merge branch 'devel-pmu' into devel (diff) | |
parent | Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-s... (diff) | |
download | linux-ac1d426e825ab5778995f2f6f053ca2e6b45c622.tar.xz linux-ac1d426e825ab5778995f2f6f053ca2e6b45c622.zip |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'fs/afs/super.c')
-rw-r--r-- | fs/afs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/afs/super.c b/fs/afs/super.c index 14f6431598ad..e932e5a3a0c1 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c @@ -311,6 +311,7 @@ static int afs_fill_super(struct super_block *sb, void *data) sb->s_magic = AFS_FS_MAGIC; sb->s_op = &afs_super_ops; sb->s_fs_info = as; + sb->s_bdi = &as->volume->bdi; /* allocate the root inode and dentry */ fid.vid = as->volume->vid; |