tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
JFS: commit_mutex cleanups

Linus Torvalds b20e481a b5032a50

+17 -18
+1 -1
fs/jfs/jfs_txnmgr.c
··· 2944 2944 * Inode is being freed 2945 2945 */ 2946 2946 list_del_init(&jfs_ip->anon_inode_list); 2947 - } else if (! !mutex_trylock(&jfs_ip->commit_mutex)) { 2947 + } else if (mutex_trylock(&jfs_ip->commit_mutex)) { 2948 2948 /* 2949 2949 * inode will be removed from anonymous list 2950 2950 * when it is committed
+16 -17
fs/jfs/namei.c
··· 165 165 166 166 out3: 167 167 txEnd(tid); 168 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 169 168 mutex_unlock(&JFS_IP(ip)->commit_mutex); 169 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 170 170 if (rc) { 171 171 free_ea_wmap(ip); 172 172 ip->i_nlink = 0; ··· 300 300 301 301 out3: 302 302 txEnd(tid); 303 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 304 303 mutex_unlock(&JFS_IP(ip)->commit_mutex); 304 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 305 305 if (rc) { 306 306 free_ea_wmap(ip); 307 307 ip->i_nlink = 0; ··· 384 384 if (rc == -EIO) 385 385 txAbort(tid, 1); 386 386 txEnd(tid); 387 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 388 387 mutex_unlock(&JFS_IP(ip)->commit_mutex); 388 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 389 389 390 390 goto out2; 391 391 } ··· 422 422 423 423 txEnd(tid); 424 424 425 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 426 425 mutex_unlock(&JFS_IP(ip)->commit_mutex); 426 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 427 427 428 428 /* 429 429 * Truncating the directory index table is not guaranteed. It ··· 503 503 if (rc == -EIO) 504 504 txAbort(tid, 1); /* Marks FS Dirty */ 505 505 txEnd(tid); 506 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 507 506 mutex_unlock(&JFS_IP(ip)->commit_mutex); 507 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 508 508 IWRITE_UNLOCK(ip); 509 509 goto out1; 510 510 } ··· 527 527 if ((new_size = commitZeroLink(tid, ip)) < 0) { 528 528 txAbort(tid, 1); /* Marks FS Dirty */ 529 529 txEnd(tid); 530 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 531 530 mutex_unlock(&JFS_IP(ip)->commit_mutex); 531 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 532 532 IWRITE_UNLOCK(ip); 533 533 rc = new_size; 534 534 goto out1; ··· 556 556 557 557 txEnd(tid); 558 558 559 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 560 559 mutex_unlock(&JFS_IP(ip)->commit_mutex); 561 - 560 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 562 561 563 562 while (new_size && (rc == 0)) { 564 563 tid = txBegin(dip->i_sb, 0); ··· 846 847 out: 847 848 txEnd(tid); 848 849 849 - mutex_unlock(&JFS_IP(dir)->commit_mutex); 850 850 mutex_unlock(&JFS_IP(ip)->commit_mutex); 851 + mutex_unlock(&JFS_IP(dir)->commit_mutex); 851 852 852 853 jfs_info("jfs_link: rc:%d", rc); 853 854 return rc; ··· 1036 1037 1037 1038 out3: 1038 1039 txEnd(tid); 1039 - mutex_unlock(&JFS_IP(dip)->commit_mutex); 1040 1040 mutex_unlock(&JFS_IP(ip)->commit_mutex); 1041 + mutex_unlock(&JFS_IP(dip)->commit_mutex); 1041 1042 if (rc) { 1042 1043 free_ea_wmap(ip); 1043 1044 ip->i_nlink = 0; ··· 1159 1160 if (S_ISDIR(new_ip->i_mode)) { 1160 1161 new_ip->i_nlink--; 1161 1162 if (new_ip->i_nlink) { 1162 - mutex_unlock(&JFS_IP(new_dir)->commit_mutex); 1163 - mutex_unlock(&JFS_IP(old_ip)->commit_mutex); 1163 + mutex_unlock(&JFS_IP(new_ip)->commit_mutex); 1164 1164 if (old_dir != new_dir) 1165 1165 mutex_unlock(&JFS_IP(old_dir)->commit_mutex); 1166 + mutex_unlock(&JFS_IP(old_ip)->commit_mutex); 1167 + mutex_unlock(&JFS_IP(new_dir)->commit_mutex); 1166 1168 if (!S_ISDIR(old_ip->i_mode) && new_ip) 1167 1169 IWRITE_UNLOCK(new_ip); 1168 1170 jfs_error(new_ip->i_sb, ··· 1281 1281 1282 1282 out4: 1283 1283 txEnd(tid); 1284 - 1285 - mutex_unlock(&JFS_IP(new_dir)->commit_mutex); 1286 - mutex_unlock(&JFS_IP(old_ip)->commit_mutex); 1287 - if (old_dir != new_dir) 1288 - mutex_unlock(&JFS_IP(old_dir)->commit_mutex); 1289 1284 if (new_ip) 1290 1285 mutex_unlock(&JFS_IP(new_ip)->commit_mutex); 1286 + if (old_dir != new_dir) 1287 + mutex_unlock(&JFS_IP(old_dir)->commit_mutex); 1288 + mutex_unlock(&JFS_IP(old_ip)->commit_mutex); 1289 + mutex_unlock(&JFS_IP(new_dir)->commit_mutex); 1291 1290 1292 1291 while (new_size && (rc == 0)) { 1293 1292 tid = txBegin(new_ip->i_sb, 0);