mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
This commit is contained in:
commit
008d23e485
325 changed files with 440 additions and 434 deletions
|
|
@ -561,7 +561,7 @@ struct ext4_new_group_data {
|
|||
#define EXT4_IOC32_SETVERSION_OLD FS_IOC32_SETVERSION
|
||||
#endif
|
||||
|
||||
/* Max physical block we can addres w/o extents */
|
||||
/* Max physical block we can address w/o extents */
|
||||
#define EXT4_MAX_BLOCK_FILE_PHYS 0xFFFFFFFF
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -2845,14 +2845,14 @@ fix_extent_len:
|
|||
* to an uninitialized extent.
|
||||
*
|
||||
* Writing to an uninitized extent may result in splitting the uninitialized
|
||||
* extent into multiple /intialized unintialized extents (up to three)
|
||||
* extent into multiple /initialized uninitialized extents (up to three)
|
||||
* There are three possibilities:
|
||||
* a> There is no split required: Entire extent should be uninitialized
|
||||
* b> Splits in two extents: Write is happening at either end of the extent
|
||||
* c> Splits in three extents: Somone is writing in middle of the extent
|
||||
*
|
||||
* One of more index blocks maybe needed if the extent tree grow after
|
||||
* the unintialized extent split. To prevent ENOSPC occur at the IO
|
||||
* the uninitialized extent split. To prevent ENOSPC occur at the IO
|
||||
* complete, we need to split the uninitialized extent before DIO submit
|
||||
* the IO. The uninitialized extent called at this time will be split
|
||||
* into three uninitialized extent(at most). After IO complete, the part
|
||||
|
|
|
|||
|
|
@ -3380,7 +3380,7 @@ int ext4_alloc_da_blocks(struct inode *inode)
|
|||
* doing I/O at all.
|
||||
*
|
||||
* We could call write_cache_pages(), and then redirty all of
|
||||
* the pages by calling redirty_page_for_writeback() but that
|
||||
* the pages by calling redirty_page_for_writepage() but that
|
||||
* would be ugly in the extreme. So instead we would need to
|
||||
* replicate parts of the code in the above functions,
|
||||
* simplifying them becuase we wouldn't actually intend to
|
||||
|
|
@ -3762,9 +3762,9 @@ retry:
|
|||
* preallocated extents, and those write extend the file, no need to
|
||||
* fall back to buffered IO.
|
||||
*
|
||||
* For holes, we fallocate those blocks, mark them as unintialized
|
||||
* For holes, we fallocate those blocks, mark them as uninitialized
|
||||
* If those blocks were preallocated, we mark sure they are splited, but
|
||||
* still keep the range to write as unintialized.
|
||||
* still keep the range to write as uninitialized.
|
||||
*
|
||||
* The unwrritten extents will be converted to written when DIO is completed.
|
||||
* For async direct IO, since the IO may still pending when return, we
|
||||
|
|
|
|||
Loading…
Reference in a new issue