Skip to content

Commit debe436

Browse files
committed
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 updates from Ted Ts'o: "Only bug fixes and cleanups for ext4 this merge window. Of note are fixes for the combination of the inline_data and fast_commit fixes, and more accurately calculating when to schedule additional lazy inode table init, especially when CONFIG_HZ is 100HZ" * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: fix error code saved on super block during file system abort ext4: inline data inode fast commit replay fixes ext4: commit inline data during fast commit ext4: scope ret locally in ext4_try_to_trim_range() ext4: remove an unused variable warning with CONFIG_QUOTA=n ext4: fix boolreturn.cocci warnings in fs/ext4/name.c ext4: prevent getting empty inode buffer ext4: move ext4_fill_raw_inode() related functions ext4: factor out ext4_fill_raw_inode() ext4: prevent partial update of the extent blocks ext4: check for inconsistent extents between index and leaf block ext4: check for out-of-order index extents in ext4_valid_extent_entries() ext4: convert from atomic_t to refcount_t on ext4_io_end->count ext4: refresh the ext4_ext_path struct after dropping i_data_sem. ext4: ensure enough credits in ext4_ext_shift_path_extents ext4: correct the left/middle/right debug message for binsearch ext4: fix lazy initialization next schedule time computation in more granular unit Revert "ext4: enforce buffer head state assertion in ext4_da_map_blocks"
2 parents 6070dcc + 124e7c6 commit debe436

File tree

8 files changed

+300
-250
lines changed

8 files changed

+300
-250
lines changed

fs/ext4/ext4.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#ifndef _EXT4_H
1818
#define _EXT4_H
1919

20+
#include <linux/refcount.h>
2021
#include <linux/types.h>
2122
#include <linux/blkdev.h>
2223
#include <linux/magic.h>
@@ -241,7 +242,7 @@ typedef struct ext4_io_end {
241242
struct bio *bio; /* Linked list of completed
242243
* bios covering the extent */
243244
unsigned int flag; /* unwritten or not */
244-
atomic_t count; /* reference counter */
245+
refcount_t count; /* reference counter */
245246
struct list_head list_vec; /* list of ext4_io_end_vec */
246247
} ext4_io_end_t;
247248

0 commit comments

Comments
 (0)