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

ufs: move lock_ufs() down into __ufs_truncate_blocks()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 493b4537 2401aa29

+2 -7
+2 -7
fs/ufs/truncate.c
··· 447 447 struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; 448 448 int retry; 449 449 450 + lock_ufs(sb); 450 451 while (1) { 451 452 retry = ufs_trunc_direct(inode); 452 453 retry |= ufs_trunc_indirect(inode, UFS_IND_BLOCK, ··· 465 464 } 466 465 467 466 ufsi->i_lastfrag = DIRECT_FRAGMENT; 467 + unlock_ufs(sb); 468 468 } 469 469 470 470 int ufs_truncate(struct inode *inode, loff_t size) 471 471 { 472 - struct super_block *sb = inode->i_sb; 473 472 int err = 0; 474 473 475 474 UFSD("ENTER: ino %lu, i_size: %llu, old_i_size: %llu\n", ··· 482 481 if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) 483 482 return -EPERM; 484 483 485 - lock_ufs(sb); 486 484 err = ufs_alloc_lastblock(inode, size); 487 485 488 486 if (err) ··· 495 495 inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC; 496 496 mark_inode_dirty(inode); 497 497 out: 498 - unlock_ufs(sb); 499 498 UFSD("EXIT: err %d\n", err); 500 499 return err; 501 500 } 502 501 503 502 void ufs_truncate_blocks(struct inode *inode) 504 503 { 505 - struct super_block *sb = inode->i_sb; 506 504 if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || 507 505 S_ISLNK(inode->i_mode))) 508 506 return; 509 507 if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) 510 508 return; 511 - 512 - lock_ufs(sb); 513 509 __ufs_truncate_blocks(inode); 514 - unlock_ufs(sb); 515 510 } 516 511 517 512 int ufs_setattr(struct dentry *dentry, struct iattr *attr)