diff options
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a3321bf22311..e5ab520724da 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -907,6 +907,25 @@ static struct dentry *ext4_fh_to_parent(struct super_block *sb, struct fid *fid, | |||
907 | ext4_nfs_get_inode); | 907 | ext4_nfs_get_inode); |
908 | } | 908 | } |
909 | 909 | ||
910 | /* | ||
911 | * Try to release metadata pages (indirect blocks, directories) which are | ||
912 | * mapped via the block device. Since these pages could have journal heads | ||
913 | * which would prevent try_to_free_buffers() from freeing them, we must use | ||
914 | * jbd2 layer's try_to_free_buffers() function to release them. | ||
915 | */ | ||
916 | static int bdev_try_to_free_page(struct super_block *sb, struct page *page, gfp_t wait) | ||
917 | { | ||
918 | journal_t *journal = EXT4_SB(sb)->s_journal; | ||
919 | |||
920 | WARN_ON(PageChecked(page)); | ||
921 | if (!page_has_buffers(page)) | ||
922 | return 0; | ||
923 | if (journal) | ||
924 | return jbd2_journal_try_to_free_buffers(journal, page, | ||
925 | wait & ~__GFP_WAIT); | ||
926 | return try_to_free_buffers(page); | ||
927 | } | ||
928 | |||
910 | #ifdef CONFIG_QUOTA | 929 | #ifdef CONFIG_QUOTA |
911 | #define QTYPE2NAME(t) ((t) == USRQUOTA ? "user" : "group") | 930 | #define QTYPE2NAME(t) ((t) == USRQUOTA ? "user" : "group") |
912 | #define QTYPE2MOPT(on, t) ((t) == USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA)) | 931 | #define QTYPE2MOPT(on, t) ((t) == USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA)) |
@@ -971,6 +990,7 @@ static const struct super_operations ext4_sops = { | |||
971 | .quota_read = ext4_quota_read, | 990 | .quota_read = ext4_quota_read, |
972 | .quota_write = ext4_quota_write, | 991 | .quota_write = ext4_quota_write, |
973 | #endif | 992 | #endif |
993 | .bdev_try_to_free_page = bdev_try_to_free_page, | ||
974 | }; | 994 | }; |
975 | 995 | ||
976 | static const struct export_operations ext4_export_ops = { | 996 | static const struct export_operations ext4_export_ops = { |