diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 00:59:55 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-14 00:59:55 +0300 |
| commit | 29c079caf584ad9a333c0d32292d036d1ae3205f (patch) | |
| tree | a31d90dd4abc210855cc5305458b2815359dd464 /fs/ext2 | |
| parent | a13f0655503a4a89df67fdc7cac6a7810795d4b3 (diff) | |
| parent | 632a9f3acd6687376cbb0b178df6048e19cbacc9 (diff) | |
| download | linux-29c079caf584ad9a333c0d32292d036d1ae3205f.tar.xz | |
Merge tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull misc filesystem updates from Jan Kara:
"A couple of small bugfixes and cleanups for quota, udf, ext2, and
reiserfs"
* tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
quota: check time limit when back out space/inode change
fs/quota: erase unused but set variable warning
quota: fix wrong indentation
udf: fix an uninitialized read bug and remove dead code
fs/reiserfs/journal.c: Make remove_journal_hash static
quota: remove trailing whitespaces
quota: code cleanup for __dquot_alloc_space()
ext2: Adjust the comment of function ext2_alloc_branch
udf: Explain handling of load_nls() failure
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index c27c27300d95..e474127dd255 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c @@ -451,7 +451,9 @@ failed_out: /** * ext2_alloc_branch - allocate and set up a chain of blocks. * @inode: owner - * @num: depth of the chain (number of blocks to allocate) + * @indirect_blks: depth of the chain (number of blocks to allocate) + * @blks: number of allocated direct blocks + * @goal: preferred place for allocation * @offsets: offsets (in the blocks) to store the pointers to next. * @branch: place to store the chain in. * |