diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-04 13:45:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-04 13:45:09 -0700 |
| commit | 2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a (patch) | |
| tree | 1a03fef18bfd416c942d82811ebb098c64f8afd8 | |
| parent | 5fdf4939dc66307daf30a3d5355a2bfb9d207676 (diff) | |
| parent | 240c5185c52d00725ae7da7d1ee82ad8b8306d52 (diff) | |
| download | linux-2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a.tar.gz linux-2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a.tar.bz2 linux-2105b9ff733c5e5ab3e0481f1c953ac3f7d7c44a.zip | |
Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy
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
| -rw-r--r-- | fs/jfs/jfs_txnmgr.c | 3 | ||||
| -rw-r--r-- | fs/jfs/resize.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c index 2e58978d6f45..4d973524c887 100644 --- a/fs/jfs/jfs_txnmgr.c +++ b/fs/jfs/jfs_txnmgr.c @@ -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(); diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c index 90b3bc21e9b0..bd9b641ada2c 100644 --- a/fs/jfs/resize.c +++ b/fs/jfs/resize.c @@ -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 */ |