Skip to content

Commit bb6b206

Browse files
committed
Merge tag 'fs_for_v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull isofs, udf, quota, ext2, and reiserfs updates from Jan Kara: - convert isofs to the new mount API - cleanup isofs Makefile - udf conversion to folios - some other small udf cleanups and fixes - ext2 cleanups - removal of reiserfs .writepage method - update reiserfs README file * tag 'fs_for_v6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: isofs: Use *-y instead of *-objs in Makefile ext2: Remove LEGACY_DIRECT_IO dependency isofs: Remove calls to set/clear the error flag ext2: Remove call to folio_set_error() udf: Use a folio in udf_write_end() udf: Convert udf_page_mkwrite() to use a folio udf: Convert udf_symlink_getattr() to use a folio udf: Convert udf_adinicb_readpage() to udf_adinicb_read_folio() udf: Convert udf_expand_file_adinicb() to use a folio udf: Convert udf_write_begin() to use a folio udf: Convert udf_symlink_filler() to use a folio reiserfs: Trim some README bits quota: fix to propagate error of mark_dquot_dirty() to caller reiserfs: Convert to writepages udf: udftime: prevent overflow in udf_disk_stamp_to_time() ext2: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method udf: replace deprecated strncpy/strcpy with strscpy udf: Remove second semicolon isofs: convert isofs to use the new mount API fs: quota: use group allocation of per-cpu counters API
2 parents d0e71e2 + 1dd719a commit bb6b206

File tree

15 files changed

+346
-353
lines changed

15 files changed

+346
-353
lines changed

fs/ext2/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ config EXT2_FS
33
tristate "Second extended fs support (DEPRECATED)"
44
select BUFFER_HEAD
55
select FS_IOMAP
6-
select LEGACY_DIRECT_IO
76
help
87
Ext2 is a standard Linux file system for hard disks.
98

fs/ext2/dir.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ static bool ext2_check_folio(struct folio *folio, int quiet, char *kaddr)
175175
(unsigned long) le32_to_cpu(p->inode));
176176
}
177177
fail:
178-
folio_set_error(folio);
179178
return false;
180179
}
181180

fs/ext2/file.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,12 @@ static ssize_t ext2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
302302
return generic_file_write_iter(iocb, from);
303303
}
304304

305+
static int ext2_file_open(struct inode *inode, struct file *filp)
306+
{
307+
filp->f_mode |= FMODE_CAN_ODIRECT;
308+
return dquot_file_open(inode, filp);
309+
}
310+
305311
const struct file_operations ext2_file_operations = {
306312
.llseek = generic_file_llseek,
307313
.read_iter = ext2_file_read_iter,
@@ -311,7 +317,7 @@ const struct file_operations ext2_file_operations = {
311317
.compat_ioctl = ext2_compat_ioctl,
312318
#endif
313319
.mmap = ext2_file_mmap,
314-
.open = dquot_file_open,
320+
.open = ext2_file_open,
315321
.release = ext2_release_file,
316322
.fsync = ext2_fsync,
317323
.get_unmapped_area = thp_get_unmapped_area,

fs/ext2/inode.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ const struct address_space_operations ext2_aops = {
965965
.write_begin = ext2_write_begin,
966966
.write_end = ext2_write_end,
967967
.bmap = ext2_bmap,
968-
.direct_IO = noop_direct_IO,
969968
.writepages = ext2_writepages,
970969
.migrate_folio = buffer_migrate_folio,
971970
.is_partially_uptodate = block_is_partially_uptodate,
@@ -974,7 +973,6 @@ const struct address_space_operations ext2_aops = {
974973

975974
static const struct address_space_operations ext2_dax_aops = {
976975
.writepages = ext2_dax_writepages,
977-
.direct_IO = noop_direct_IO,
978976
.dirty_folio = noop_dirty_folio,
979977
};
980978

fs/isofs/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
obj-$(CONFIG_ISO9660_FS) += isofs.o
77

8-
isofs-objs-y := namei.o inode.o dir.o util.o rock.o export.o
9-
isofs-objs-$(CONFIG_JOLIET) += joliet.o
10-
isofs-objs-$(CONFIG_ZISOFS) += compress.o
11-
isofs-objs := $(isofs-objs-y)
8+
isofs-y := namei.o inode.o dir.o util.o rock.o export.o
9+
isofs-$(CONFIG_JOLIET) += joliet.o
10+
isofs-$(CONFIG_ZISOFS) += compress.o

fs/isofs/compress.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,6 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)
346346
for (i = 0; i < pcount; i++, index++) {
347347
if (i != full_page)
348348
pages[i] = grab_cache_page_nowait(mapping, index);
349-
if (pages[i])
350-
ClearPageError(pages[i]);
351349
}
352350

353351
err = zisofs_fill_pages(inode, full_page, pcount, pages);
@@ -356,8 +354,6 @@ static int zisofs_read_folio(struct file *file, struct folio *folio)
356354
for (i = 0; i < pcount; i++) {
357355
if (pages[i]) {
358356
flush_dcache_page(pages[i]);
359-
if (i == full_page && err)
360-
SetPageError(pages[i]);
361357
unlock_page(pages[i]);
362358
if (i != full_page)
363359
put_page(pages[i]);

0 commit comments

Comments
 (0)