evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://oss.sgi.com:8090/xfs-2.6

Browse source 
* git://oss.sgi.com:8090/xfs-2.6:
  [XFS] Fix a possible metadata buffer (AGFL) refcount leak when fixing an
  [XFS] Fix a project quota space accounting leak on rename.
  [XFS] Fix a possible forced shutdown due to mishandling write barriers
This commit is contained in:
Linus Torvalds 2006-05-08 17:41:05 -07:00
commit e515f048c4
4 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/xfs/xfs_alloc.c
View file

@ -1942,8 +1942,10 @@ xfs_alloc_fix_freelist(
/* /*
* Allocate as many blocks as possible at once. * Allocate as many blocks as possible at once.
*/ */
if ((error = xfs_alloc_ag_vextent(&targs))) if ((error = xfs_alloc_ag_vextent(&targs))) {
xfs_trans_brelse(tp, agflbp);
return error; return error;
}
/* /*
* Stop if we run out. Won't happen if callers are obeying * Stop if we run out. Won't happen if callers are obeying
* the restrictions correctly. Can happen for free calls * the restrictions correctly. Can happen for free calls
@ -1960,6 +1962,7 @@ xfs_alloc_fix_freelist(
return error; return error;
} }
} }
xfs_trans_brelse(tp, agflbp);
args->agbp = agbp; args->agbp = agbp;
return 0; return 0;
} }

12
fs/xfs/xfs_rename.c
View file

@ -316,6 +316,18 @@ xfs_rename(
} }
} }
/*
* If we are using project inheritance, we only allow renames
* into our tree when the project IDs are the same; else the
* tree quota mechanism would be circumvented.
*/
if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(target_dp->i_d.di_projid != src_ip->i_d.di_projid))) {
error = XFS_ERROR(EXDEV);
xfs_rename_unlock4(inodes, XFS_ILOCK_SHARED);
goto rele_return;
}
new_parent = (src_dp != target_dp); new_parent = (src_dp != target_dp);
src_is_directory = ((src_ip->i_d.di_mode & S_IFMT) == S_IFDIR); src_is_directory = ((src_ip->i_d.di_mode & S_IFMT) == S_IFDIR);

27
fs/xfs/xfs_vfsops.c
View file

@ -669,31 +669,22 @@ xfs_mntupdate(
xfs_mount_t *mp = XFS_BHVTOM(bdp); xfs_mount_t *mp = XFS_BHVTOM(bdp);
int error; int error;
if (args->flags & XFSMNT_BARRIER) if (!(*flags & MS_RDONLY)) { /* rw/ro -> rw */
mp->m_flags |= XFS_MOUNT_BARRIER; if (vfsp->vfs_flag & VFS_RDONLY)
else vfsp->vfs_flag &= ~VFS_RDONLY;
mp->m_flags &= ~XFS_MOUNT_BARRIER; if (args->flags & XFSMNT_BARRIER) {
mp->m_flags |= XFS_MOUNT_BARRIER;
if ((vfsp->vfs_flag & VFS_RDONLY) &&
!(*flags & MS_RDONLY)) {
vfsp->vfs_flag &= ~VFS_RDONLY;
if (args->flags & XFSMNT_BARRIER)
xfs_mountfs_check_barriers(mp); xfs_mountfs_check_barriers(mp);
} } else {
mp->m_flags &= ~XFS_MOUNT_BARRIER;
if (!(vfsp->vfs_flag & VFS_RDONLY) && }
(*flags & MS_RDONLY)) { } else if (!(vfsp->vfs_flag & VFS_RDONLY)) { /* rw -> ro */
VFS_SYNC(vfsp, SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR, NULL, error); VFS_SYNC(vfsp, SYNC_FSDATA|SYNC_BDFLUSH|SYNC_ATTR, NULL, error);
xfs_quiesce_fs(mp); xfs_quiesce_fs(mp);
/* Ok now write out an unmount record */
xfs_log_unmount_write(mp); xfs_log_unmount_write(mp);
xfs_unmountfs_writesb(mp); xfs_unmountfs_writesb(mp);
vfsp->vfs_flag |= VFS_RDONLY; vfsp->vfs_flag |= VFS_RDONLY;
} }
return 0; return 0;
} }

2
fs/xfs/xfs_vnodeops.c
View file

@ -2663,7 +2663,7 @@ xfs_link(
*/ */
if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(tdp->i_d.di_projid != sip->i_d.di_projid))) { (tdp->i_d.di_projid != sip->i_d.di_projid))) {
error = XFS_ERROR(EPERM); error = XFS_ERROR(EXDEV);
goto error_return; goto error_return;
} }