From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 9 Jun 2017 03:27:12 +0000 (-0400)
Subject: ufs_extend_tail(): fix the braino in calling conventions of ufs_new_fragments()
X-Git-Tag: release-20171130_firefly~4^2~100^2~1^2~4^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=34aa71cbd4085fe6089f8686a6ae449aaf36b4a0;p=firefly-linux-kernel-4.4.55.git

ufs_extend_tail(): fix the braino in calling conventions of ufs_new_fragments()

commit 940ef1a0ed939c2ca029fca715e25e7778ce1e34 upstream.

... and it really needs splitting into "new" and "extend" cases, but that's for
later

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index d7b553300c85..2ceccec0b609 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -235,7 +235,8 @@ ufs_extend_tail(struct inode *inode, u64 writes_to,
 
 	p = ufs_get_direct_data_ptr(uspi, ufsi, block);
 	tmp = ufs_new_fragments(inode, p, lastfrag, ufs_data_ptr_to_cpu(sb, p),
-				new_size, err, locked_page);
+				new_size - (lastfrag & uspi->s_fpbmask), err,
+				locked_page);
 	return tmp != 0;
 }