git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
xfs
/
xfs_vnodeops.c
diff --git
a/fs/xfs/xfs_vnodeops.c
b/fs/xfs/xfs_vnodeops.c
index
8abbe35
..
aa90340
100644
(file)
--- a/
fs/xfs/xfs_vnodeops.c
+++ b/
fs/xfs/xfs_vnodeops.c
@@
-623,7
+623,6
@@
xfs_setattr(
code = xfs_igrow_start(ip, vap->va_size, credp);
}
xfs_iunlock(ip, XFS_ILOCK_EXCL);
code = xfs_igrow_start(ip, vap->va_size, credp);
}
xfs_iunlock(ip, XFS_ILOCK_EXCL);
- vn_iowait(vp); /* wait for the completion of any pending DIOs */
if (!code)
code = xfs_itruncate_data(ip, vap->va_size);
if (code) {
if (!code)
code = xfs_itruncate_data(ip, vap->va_size);
if (code) {
@@
-866,7
+865,7
@@
xfs_setattr(
* If this is a synchronous mount, make sure that the
* transaction goes to disk before returning to the user.
* This is slightly sub-optimal in that truncates require
* If this is a synchronous mount, make sure that the
* transaction goes to disk before returning to the user.
* This is slightly sub-optimal in that truncates require
- * two sync transactions instead of one for wsync filesy
s
tems.
+ * two sync transactions instead of one for wsync filesytems.
* One for the truncate and one for the timestamps since we
* don't want to change the timestamps unless we're sure the
* truncate worked. Truncates are less than 1% of the laddis
* One for the truncate and one for the timestamps since we
* don't want to change the timestamps unless we're sure the
* truncate worked. Truncates are less than 1% of the laddis
@@
-1188,7
+1187,7
@@
xfs_fsync(
/*
* If this inode is on the RT dev we need to flush that
/*
* If this inode is on the RT dev we need to flush that
- * cache as
well.
+ * cache aswell.
*/
if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)
xfs_blkdev_issue_flush(ip->i_mount->m_rtdev_targp);
*/
if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)
xfs_blkdev_issue_flush(ip->i_mount->m_rtdev_targp);
@@
-1353,7
+1352,7
@@
xfs_inactive_symlink_rmt(
*/
done = 0;
XFS_BMAP_INIT(&free_list, &first_block);
*/
done = 0;
XFS_BMAP_INIT(&free_list, &first_block);
- nmaps =
ARRAY_SIZE(mval
);
+ nmaps =
sizeof(mval) / sizeof(mval[0]
);
if ((error = xfs_bmapi(tp, ip, 0, XFS_B_TO_FSB(mp, size),
XFS_BMAPI_METADATA, &first_block, 0, mval, &nmaps,
&free_list)))
if ((error = xfs_bmapi(tp, ip, 0, XFS_B_TO_FSB(mp, size),
XFS_BMAPI_METADATA, &first_block, 0, mval, &nmaps,
&free_list)))
@@
-1398,7
+1397,7
@@
xfs_inactive_symlink_rmt(
*/
ntp = xfs_trans_dup(tp);
/*
*/
ntp = xfs_trans_dup(tp);
/*
- * Commit the transaction containing extent freeing and EFDs.
+ * Commit the transaction containing extent freeing and EFD
'
s.
* If we get an error on the commit here or on the reserve below,
* we need to unlock the inode since the new transaction doesn't
* have the inode attached.
* If we get an error on the commit here or on the reserve below,
* we need to unlock the inode since the new transaction doesn't
* have the inode attached.
@@
-1575,7
+1574,7
@@
xfs_release(
if ((error = xfs_inactive_free_eofblocks(mp, ip)))
return error;
/* Update linux inode block count after free above */
if ((error = xfs_inactive_free_eofblocks(mp, ip)))
return error;
/* Update linux inode block count after free above */
-
vn_to_inode
(vp)->i_blocks = XFS_FSB_TO_BB(mp,
+
LINVFS_GET_IP
(vp)->i_blocks = XFS_FSB_TO_BB(mp,
ip->i_d.di_nblocks + ip->i_delayed_blks);
}
}
ip->i_d.di_nblocks + ip->i_delayed_blks);
}
}
@@
-1656,7
+1655,7
@@
xfs_inactive(
if ((error = xfs_inactive_free_eofblocks(mp, ip)))
return VN_INACTIVE_CACHE;
/* Update linux inode block count after free above */
if ((error = xfs_inactive_free_eofblocks(mp, ip)))
return VN_INACTIVE_CACHE;
/* Update linux inode block count after free above */
-
vn_to_inode
(vp)->i_blocks = XFS_FSB_TO_BB(mp,
+
LINVFS_GET_IP
(vp)->i_blocks = XFS_FSB_TO_BB(mp,
ip->i_d.di_nblocks + ip->i_delayed_blks);
}
goto out;
ip->i_d.di_nblocks + ip->i_delayed_blks);
}
goto out;
@@
-2041,7
+2040,7
@@
xfs_create(
XFS_QM_DQRELE(mp, gdqp);
/*
XFS_QM_DQRELE(mp, gdqp);
/*
- * Prop
a
gate the fact that the vnode changed after the
+ * Prop
o
gate the fact that the vnode changed after the
* xfs_inode locks have been released.
*/
VOP_VNODE_CHANGE(vp, VCHANGE_FLAGS_TRUNCATED, 3);
* xfs_inode locks have been released.
*/
VOP_VNODE_CHANGE(vp, VCHANGE_FLAGS_TRUNCATED, 3);
@@
-2388,7
+2387,7
@@
xfs_remove(
* for a log reservation. Since we'll have to wait for the
* inactive code to complete before returning from xfs_iget,
* we need to make sure that we don't have log space reserved
* for a log reservation. Since we'll have to wait for the
* inactive code to complete before returning from xfs_iget,
* we need to make sure that we don't have log space reserved
- * when we call xfs_iget. Instead we get an unlocked refere
n
ce
+ * when we call xfs_iget. Instead we get an unlocked referece
* to the inode before getting our log reservation.
*/
error = xfs_get_dir_entry(dentry, &ip);
* to the inode before getting our log reservation.
*/
error = xfs_get_dir_entry(dentry, &ip);
@@
-2681,7
+2680,7
@@
xfs_link(
*/
if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(tdp->i_d.di_projid != sip->i_d.di_projid))) {
*/
if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) &&
(tdp->i_d.di_projid != sip->i_d.di_projid))) {
- error = XFS_ERROR(E
XDEV
);
+ error = XFS_ERROR(E
PERM
);
goto error_return;
}
goto error_return;
}
@@
-3038,7
+3037,7
@@
xfs_rmdir(
* for a log reservation. Since we'll have to wait for the
* inactive code to complete before returning from xfs_iget,
* we need to make sure that we don't have log space reserved
* for a log reservation. Since we'll have to wait for the
* inactive code to complete before returning from xfs_iget,
* we need to make sure that we don't have log space reserved
- * when we call xfs_iget. Instead we get an unlocked refere
n
ce
+ * when we call xfs_iget. Instead we get an unlocked referece
* to the inode before getting our log reservation.
*/
error = xfs_get_dir_entry(dentry, &cdp);
* to the inode before getting our log reservation.
*/
error = xfs_get_dir_entry(dentry, &cdp);
@@
-3205,7
+3204,7
@@
xfs_rmdir(
/* Fall through to std_return with error = 0 or the errno
* from xfs_trans_commit. */
/* Fall through to std_return with error = 0 or the errno
* from xfs_trans_commit. */
-
std_return:
+std_return:
if (DM_EVENT_ENABLED(dir_vp->v_vfsp, dp, DM_EVENT_POSTREMOVE)) {
(void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE,
dir_vp, DM_RIGHT_NULL,
if (DM_EVENT_ENABLED(dir_vp->v_vfsp, dp, DM_EVENT_POSTREMOVE)) {
(void) XFS_SEND_NAMESP(mp, DM_EVENT_POSTREMOVE,
dir_vp, DM_RIGHT_NULL,
@@
-3215,12
+3214,12
@@
xfs_rmdir(
}
return error;
}
return error;
-
error1:
+error1:
xfs_bmap_cancel(&free_list);
cancel_flags |= XFS_TRANS_ABORT;
/* FALLTHROUGH */
xfs_bmap_cancel(&free_list);
cancel_flags |= XFS_TRANS_ABORT;
/* FALLTHROUGH */
-
error_return:
+error_return:
xfs_trans_cancel(tp, cancel_flags);
goto std_return;
}
xfs_trans_cancel(tp, cancel_flags);
goto std_return;
}
@@
-4329,10
+4328,8
@@
xfs_free_file_space(
ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1);
if (attr_flags & ATTR_NOLOCK)
need_iolock = 0;
ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1);
if (attr_flags & ATTR_NOLOCK)
need_iolock = 0;
- if (need_iolock)
{
+ if (need_iolock)
xfs_ilock(ip, XFS_IOLOCK_EXCL);
xfs_ilock(ip, XFS_IOLOCK_EXCL);
- vn_iowait(vp); /* wait for the completion of any pending DIOs */
- }
rounding = MAX((__uint8_t)(1 << mp->m_sb.sb_blocklog),
(__uint8_t)NBPP);
rounding = MAX((__uint8_t)(1 << mp->m_sb.sb_blocklog),
(__uint8_t)NBPP);
@@
-4666,10
+4663,6
@@
vnodeops_t xfs_vnodeops = {
.vop_read = xfs_read,
#ifdef HAVE_SENDFILE
.vop_sendfile = xfs_sendfile,
.vop_read = xfs_read,
#ifdef HAVE_SENDFILE
.vop_sendfile = xfs_sendfile,
-#endif
-#ifdef HAVE_SPLICE
- .vop_splice_read = xfs_splice_read,
- .vop_splice_write = xfs_splice_write,
#endif
.vop_write = xfs_write,
.vop_ioctl = xfs_ioctl,
#endif
.vop_write = xfs_write,
.vop_ioctl = xfs_ioctl,