tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy

Browse Source 
Pull jfs updates from David Kleikamp:
 "Minor jfs updates"

* tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy:
  jfs: Simplify code
  jfs: jump to error_out when filemap_{fdatawait, write_and_wait} fails
This commit is contained in:
Linus Torvalds
2016-10-04 13:45:09 -07:00
parent 5fdf4939dc 240c5185c5
commit 2105b9ff73
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/jfs/jfs_txnmgr.c
+1 -2
View File
@@ -2893,8 +2893,7 @@ restart:
* on anon_list2. Let's check.
*/
if (!list_empty(&TxAnchor.anon_list2)) {
list_splice(&TxAnchor.anon_list2, &TxAnchor.anon_list);
INIT_LIST_HEAD(&TxAnchor.anon_list2);
list_splice_init(&TxAnchor.anon_list2, &TxAnchor.anon_list);
goto restart;
}
TXN_UNLOCK();
fs/jfs/resize.c
+8 -2
View File
@@ -379,8 +379,14 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
* cached in meta-data cache, and not written out
* by txCommit();
*/
filemap_fdatawait(ipbmap->i_mapping);
filemap_write_and_wait(ipbmap->i_mapping);
rc = filemap_fdatawait(ipbmap->i_mapping);
if (rc)
goto error_out;
rc = filemap_write_and_wait(ipbmap->i_mapping);
if (rc)
goto error_out;
diWriteSpecial(ipbmap, 0);
newPage = nPages; /* first new page number */