a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: always take the iolock around xfs_setattr_size

Browse Source 
There is no reason to conditionally take the iolock inside xfs_setattr_size
when we can let the caller handle it unconditionally, which just incrases
the lock hold time for the case where it was previously taken internally
by a few instructions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
Christoph Hellwig 2013-10-14 07:09:35 -07:00 committed by Ben Myers
parent 59e5a0e821
commit 76ca4c238c
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/xfs/xfs_bmap_util.c
View File

@ -1622,8 +1622,7 @@ xfs_change_file_space(
iattr.ia_valid = ATTR_SIZE; iattr.ia_valid = ATTR_SIZE;
iattr.ia_size = startoffset; iattr.ia_size = startoffset;
error = xfs_setattr_size(ip, &iattr, error = xfs_setattr_size(ip, &iattr);
attr_flags | XFS_ATTR_NOLOCK);
xfs_iunlock(ip, XFS_IOLOCK_EXCL); xfs_iunlock(ip, XFS_IOLOCK_EXCL);
if (error) if (error)

2
fs/xfs/xfs_file.c
View File

@ -852,7 +852,7 @@ xfs_file_fallocate(
iattr.ia_valid = ATTR_SIZE; iattr.ia_valid = ATTR_SIZE;
iattr.ia_size = new_size; iattr.ia_size = new_size;
error = -xfs_setattr_size(ip, &iattr, XFS_ATTR_NOLOCK); error = -xfs_setattr_size(ip, &iattr);
} }
out_unlock: out_unlock:

39
fs/xfs/xfs_iops.c
View File

@ -709,8 +709,7 @@ out_dqrele:
int int
xfs_setattr_size( xfs_setattr_size(
struct xfs_inode *ip, struct xfs_inode *ip,
struct iattr *iattr, struct iattr *iattr)
int flags)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = ip->i_mount;
struct inode *inode = VFS_I(ip); struct inode *inode = VFS_I(ip);
@ -733,15 +732,11 @@ xfs_setattr_size(
if (error) if (error)
return XFS_ERROR(error); return XFS_ERROR(error);
ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL));
ASSERT(S_ISREG(ip->i_d.di_mode)); ASSERT(S_ISREG(ip->i_d.di_mode));
ASSERT((mask & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET| ASSERT((mask & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET|
ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0); ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
if (!(flags & XFS_ATTR_NOLOCK)) {
lock_flags |= XFS_IOLOCK_EXCL;
xfs_ilock(ip, lock_flags);
}
oldsize = inode->i_size; oldsize = inode->i_size;
newsize = iattr->ia_size; newsize = iattr->ia_size;
@ -750,12 +745,11 @@ xfs_setattr_size(
*/ */
if (newsize == 0 && oldsize == 0 && ip->i_d.di_nextents == 0) { if (newsize == 0 && oldsize == 0 && ip->i_d.di_nextents == 0) {
if (!(mask & (ATTR_CTIME|ATTR_MTIME))) if (!(mask & (ATTR_CTIME|ATTR_MTIME)))
goto out_unlock; return 0;
/* /*
* Use the regular setattr path to update the timestamps. * Use the regular setattr path to update the timestamps.
*/ */
xfs_iunlock(ip, lock_flags);
iattr->ia_valid &= ~ATTR_SIZE; iattr->ia_valid &= ~ATTR_SIZE;
return xfs_setattr_nonsize(ip, iattr, 0); return xfs_setattr_nonsize(ip, iattr, 0);
} }
@ -765,7 +759,7 @@ xfs_setattr_size(
*/ */
error = xfs_qm_dqattach(ip, 0); error = xfs_qm_dqattach(ip, 0);
if (error) if (error)
goto out_unlock; return error;
/* /*
* Now we can make the changes. Before we join the inode to the * Now we can make the changes. Before we join the inode to the
@ -783,7 +777,7 @@ xfs_setattr_size(
*/ */
error = xfs_zero_eof(ip, newsize, oldsize); error = xfs_zero_eof(ip, newsize, oldsize);
if (error) if (error)
goto out_unlock; return error;
} }
/* /*
@ -802,7 +796,7 @@ xfs_setattr_size(
error = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping, error = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
ip->i_d.di_size, newsize); ip->i_d.di_size, newsize);
if (error) if (error)
goto out_unlock; return error;
} }
/* /*
@ -812,7 +806,7 @@ xfs_setattr_size(
error = -block_truncate_page(inode->i_mapping, newsize, xfs_get_blocks); error = -block_truncate_page(inode->i_mapping, newsize, xfs_get_blocks);
if (error) if (error)
goto out_unlock; return error;
tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE); tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_SIZE);
error = xfs_trans_reserve(tp, &M_RES(mp)->tr_itruncate, 0, 0); error = xfs_trans_reserve(tp, &M_RES(mp)->tr_itruncate, 0, 0);
@ -916,12 +910,21 @@ out_trans_cancel:
STATIC int STATIC int
xfs_vn_setattr( xfs_vn_setattr(
struct dentry *dentry, struct dentry *dentry,
struct iattr *iattr) struct iattr *iattr)
{ {
if (iattr->ia_valid & ATTR_SIZE) struct xfs_inode *ip = XFS_I(dentry->d_inode);
return -xfs_setattr_size(XFS_I(dentry->d_inode), iattr, 0); int error;
return -xfs_setattr_nonsize(XFS_I(dentry->d_inode), iattr, 0);
if (iattr->ia_valid & ATTR_SIZE) {
xfs_ilock(ip, XFS_IOLOCK_EXCL);
error = xfs_setattr_size(ip, iattr);
xfs_iunlock(ip, XFS_IOLOCK_EXCL);
} else {
error = xfs_setattr_nonsize(ip, iattr, 0);
}
return -error;
} }
STATIC int STATIC int

2
fs/xfs/xfs_iops.h
View File

@ -38,6 +38,6 @@ extern void xfs_setup_inode(struct xfs_inode *);
extern int xfs_setattr_nonsize(struct xfs_inode *ip, struct iattr *vap, extern int xfs_setattr_nonsize(struct xfs_inode *ip, struct iattr *vap,
int flags); int flags);
extern int xfs_setattr_size(struct xfs_inode *ip, struct iattr *vap, int flags); extern int xfs_setattr_size(struct xfs_inode *ip, struct iattr *vap);
#endif /* __XFS_IOPS_H__ */ #endif /* __XFS_IOPS_H__ */