GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next

Browse source 
Conflicts:
	fs/xfs/xfs_iops.c
This commit is contained in:
Dave Chinner 2014-12-04 09:46:17 +11:00
commit 6044e4386c
24 changed files with 270 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

12
fs/xfs/xfs_inode.c
View file

@ -2483,9 +2483,7 @@ xfs_remove(
xfs_fsblock_t first_block;
int cancel_flags;
int committed;
int link_zero;
uint resblks;
uint log_count;
trace_xfs_remove(dp, name);
@ -2500,13 +2498,10 @@ xfs_remove(
if (error)
goto std_return;
if (is_dir) {
if (is_dir)
tp = xfs_trans_alloc(mp, XFS_TRANS_RMDIR);
log_count = XFS_DEFAULT_LOG_COUNT;
} else {
else
tp = xfs_trans_alloc(mp, XFS_TRANS_REMOVE);
log_count = XFS_REMOVE_LOG_COUNT;
}
cancel_flags = XFS_TRANS_RELEASE_LOG_RES;
/*
@ -2574,9 +2569,6 @@ xfs_remove(
if (error)
goto out_trans_cancel;
/* Determine if this is the last link while the inode is locked */
link_zero = (ip->i_d.di_nlink == 0);
xfs_bmap_init(&free_list, &first_block);
error = xfs_dir_removename(tp, dp, name, ip->i_ino,
&first_block, &free_list, resblks);