dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

xfs: remove block number from inode lookup code 

The block number comes from bulkstat based inode lookups to shortcut
the mapping calculations. We ar enot able to trust anything from
bulkstat, so drop the block number as well so that the correct
lookups and mappings are always done.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Dave Chinner 2010-06-24 11:35:17 +10:00 committed by Dave Chinner
parent 1920779e67
commit 7b6259e7a8
15 changed files with 26 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/linux-2.6/xfs_export.c
View File

@ -133,7 +133,7 @@ xfs_nfs_get_inode(
* send invalid file handles and we have to handle it gracefully.. * send invalid file handles and we have to handle it gracefully..
*/ */
error = xfs_iget(mp, NULL, ino, XFS_IGET_UNTRUSTED, error = xfs_iget(mp, NULL, ino, XFS_IGET_UNTRUSTED,
XFS_ILOCK_SHARED, &ip, 0); XFS_ILOCK_SHARED, &ip);
if (error) { if (error) {
/* /*
* EINVAL means the inode cluster doesn't exist anymore. * EINVAL means the inode cluster doesn't exist anymore.

5
fs/xfs/linux-2.6/xfs_ioctl32.c
View File

@ -237,12 +237,11 @@ xfs_bulkstat_one_compat(
xfs_ino_t ino, /* inode number to get data for */ xfs_ino_t ino, /* inode number to get data for */
void __user *buffer, /* buffer to place output in */ void __user *buffer, /* buffer to place output in */
int ubsize, /* size of buffer */ int ubsize, /* size of buffer */
xfs_daddr_t bno, /* starting bno of inode cluster */
int *ubused, /* bytes used by me */ int *ubused, /* bytes used by me */
int *stat) /* BULKSTAT_RV_... */ int *stat) /* BULKSTAT_RV_... */
{ {
return xfs_bulkstat_one_int(mp, ino, buffer, ubsize, return xfs_bulkstat_one_int(mp, ino, buffer, ubsize,
xfs_bulkstat_one_fmt_compat, bno, xfs_bulkstat_one_fmt_compat,
ubused, stat); ubused, stat);
} }
@ -296,7 +295,7 @@ xfs_compat_ioc_bulkstat(
int res; int res;
error = xfs_bulkstat_one_compat(mp, inlast, bulkreq.ubuffer, error = xfs_bulkstat_one_compat(mp, inlast, bulkreq.ubuffer,
sizeof(compat_xfs_bstat_t), 0, NULL, &res); sizeof(compat_xfs_bstat_t), 0, &res);
} else if (cmd == XFS_IOC_FSBULKSTAT_32) { } else if (cmd == XFS_IOC_FSBULKSTAT_32) {
error = xfs_bulkstat(mp, &inlast, &count, error = xfs_bulkstat(mp, &inlast, &count,
xfs_bulkstat_one_compat, sizeof(compat_xfs_bstat_t), xfs_bulkstat_one_compat, sizeof(compat_xfs_bstat_t),

7
fs/xfs/quota/xfs_qm.c
View File

@ -1632,7 +1632,6 @@ xfs_qm_dqusage_adjust(
xfs_ino_t ino, /* inode number to get data for */ xfs_ino_t ino, /* inode number to get data for */
void __user *buffer, /* not used */ void __user *buffer, /* not used */
int ubsize, /* not used */ int ubsize, /* not used */
xfs_daddr_t bno, /* starting block of inode cluster */
int *ubused, /* not used */ int *ubused, /* not used */
int *res) /* result code value */ int *res) /* result code value */
{ {
@ -1658,7 +1657,7 @@ xfs_qm_dqusage_adjust(
* the case in all other instances. It's OK that we do this because * the case in all other instances. It's OK that we do this because
* quotacheck is done only at mount time. * quotacheck is done only at mount time.
*/ */
if ((error = xfs_iget(mp, NULL, ino, 0, XFS_ILOCK_EXCL, &ip, bno))) { if ((error = xfs_iget(mp, NULL, ino, 0, XFS_ILOCK_EXCL, &ip))) {
*res = BULKSTAT_RV_NOTHING; *res = BULKSTAT_RV_NOTHING;
return error; return error;
} }
@ -1888,14 +1887,14 @@ xfs_qm_init_quotainos(
mp->m_sb.sb_uquotino != NULLFSINO) { mp->m_sb.sb_uquotino != NULLFSINO) {
ASSERT(mp->m_sb.sb_uquotino > 0); ASSERT(mp->m_sb.sb_uquotino > 0);
if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
0, 0, &uip, 0))) 0, 0, &uip)))
return XFS_ERROR(error); return XFS_ERROR(error);
} }
if (XFS_IS_OQUOTA_ON(mp) && if (XFS_IS_OQUOTA_ON(mp) &&
mp->m_sb.sb_gquotino != NULLFSINO) { mp->m_sb.sb_gquotino != NULLFSINO) {
ASSERT(mp->m_sb.sb_gquotino > 0); ASSERT(mp->m_sb.sb_gquotino > 0);
if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, if ((error = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,
0, 0, &gip, 0))) { 0, 0, &gip))) {
if (uip) if (uip)
IRELE(uip); IRELE(uip);
return XFS_ERROR(error); return XFS_ERROR(error);

11
fs/xfs/quota/xfs_qm_syscalls.c
View File

@ -262,7 +262,7 @@ xfs_qm_scall_trunc_qfiles(
} }
if ((flags & XFS_DQ_USER) && mp->m_sb.sb_uquotino != NULLFSINO) { if ((flags & XFS_DQ_USER) && mp->m_sb.sb_uquotino != NULLFSINO) {
error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip, 0); error = xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, 0, 0, &qip);
if (!error) { if (!error) {
error = xfs_truncate_file(mp, qip); error = xfs_truncate_file(mp, qip);
IRELE(qip); IRELE(qip);
@ -271,7 +271,7 @@ xfs_qm_scall_trunc_qfiles(
if ((flags & (XFS_DQ_GROUP|XFS_DQ_PROJ)) && if ((flags & (XFS_DQ_GROUP|XFS_DQ_PROJ)) &&
mp->m_sb.sb_gquotino != NULLFSINO) { mp->m_sb.sb_gquotino != NULLFSINO) {
error2 = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip, 0); error2 = xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, 0, 0, &qip);
if (!error2) { if (!error2) {
error2 = xfs_truncate_file(mp, qip); error2 = xfs_truncate_file(mp, qip);
IRELE(qip); IRELE(qip);
@ -417,12 +417,12 @@ xfs_qm_scall_getqstat(
} }
if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) { if (!uip && mp->m_sb.sb_uquotino != NULLFSINO) {
if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino, if (xfs_iget(mp, NULL, mp->m_sb.sb_uquotino,
0, 0, &uip, 0) == 0) 0, 0, &uip) == 0)
tempuqip = B_TRUE; tempuqip = B_TRUE;
} }
if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) { if (!gip && mp->m_sb.sb_gquotino != NULLFSINO) {
if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino, if (xfs_iget(mp, NULL, mp->m_sb.sb_gquotino,
0, 0, &gip, 0) == 0) 0, 0, &gip) == 0)
tempgqip = B_TRUE; tempgqip = B_TRUE;
} }
if (uip) { if (uip) {
@ -1109,7 +1109,6 @@ xfs_qm_internalqcheck_adjust(
xfs_ino_t ino, /* inode number to get data for */ xfs_ino_t ino, /* inode number to get data for */
void __user *buffer, /* not used */ void __user *buffer, /* not used */
int ubsize, /* not used */ int ubsize, /* not used */
xfs_daddr_t bno, /* starting block of inode cluster */
int *ubused, /* not used */ int *ubused, /* not used */
int *res) /* bulkstat result code */ int *res) /* bulkstat result code */
{ {
@ -1132,7 +1131,7 @@ xfs_qm_internalqcheck_adjust(
ipreleased = B_FALSE; ipreleased = B_FALSE;
again: again:
lock_flags = XFS_ILOCK_SHARED; lock_flags = XFS_ILOCK_SHARED;
if ((error = xfs_iget(mp, NULL, ino, 0, lock_flags, &ip, bno))) { if ((error = xfs_iget(mp, NULL, ino, 0, lock_flags, &ip))) {
*res = BULKSTAT_RV_NOTHING; *res = BULKSTAT_RV_NOTHING;
return (error); return (error);
} }

16
fs/xfs/xfs_ialloc.c
View File

@ -1354,22 +1354,6 @@ xfs_imap(
return 0; return 0;
} }
/*
* If we get a block number passed we can use it to
* find the buffer easily.
*/
if (imap->im_blkno) {
offset = XFS_INO_TO_OFFSET(mp, ino);
ASSERT(offset < mp->m_sb.sb_inopblock);
cluster_agbno = xfs_daddr_to_agbno(mp, imap->im_blkno);
offset += (agbno - cluster_agbno) * mp->m_sb.sb_inopblock;
imap->im_len = XFS_FSB_TO_BB(mp, blks_per_cluster);
imap->im_boffset = (ushort)(offset << mp->m_sb.sb_inodelog);
return 0;
}
/* /*
* If the inode chunks are aligned then use simple maths to * If the inode chunks are aligned then use simple maths to
* find the location. Otherwise we have to do a btree * find the location. Otherwise we have to do a btree

10
fs/xfs/xfs_iget.c
View File

@ -259,7 +259,6 @@ xfs_iget_cache_miss(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_ino_t ino, xfs_ino_t ino,
struct xfs_inode **ipp, struct xfs_inode **ipp,
xfs_daddr_t bno,
int flags, int flags,
int lock_flags) int lock_flags)
{ {
@ -272,7 +271,7 @@ xfs_iget_cache_miss(
if (!ip) if (!ip)
return ENOMEM; return ENOMEM;
error = xfs_iread(mp, tp, ip, bno, flags); error = xfs_iread(mp, tp, ip, flags);
if (error) if (error)
goto out_destroy; goto out_destroy;
@ -358,8 +357,6 @@ out_destroy:
* within the file system for the inode being requested. * within the file system for the inode being requested.
* lock_flags -- flags indicating how to lock the inode. See the comment * lock_flags -- flags indicating how to lock the inode. See the comment
* for xfs_ilock() for a list of valid values. * for xfs_ilock() for a list of valid values.
* bno -- the block number starting the buffer containing the inode,
* if known (as by bulkstat), else 0.
*/ */
int int
xfs_iget( xfs_iget(
@ -368,8 +365,7 @@ xfs_iget(
xfs_ino_t ino, xfs_ino_t ino,
uint flags, uint flags,
uint lock_flags, uint lock_flags,
xfs_inode_t **ipp, xfs_inode_t **ipp)
xfs_daddr_t bno)
{ {
xfs_inode_t *ip; xfs_inode_t *ip;
int error; int error;
@ -397,7 +393,7 @@ again:
read_unlock(&pag->pag_ici_lock); read_unlock(&pag->pag_ici_lock);
XFS_STATS_INC(xs_ig_missed); XFS_STATS_INC(xs_ig_missed);
error = xfs_iget_cache_miss(mp, pag, tp, ino, &ip, bno, error = xfs_iget_cache_miss(mp, pag, tp, ino, &ip,
flags, lock_flags); flags, lock_flags);
if (error) if (error)
goto out_error_or_again; goto out_error_or_again;

3
fs/xfs/xfs_inode.c
View File

@ -787,7 +787,6 @@ xfs_iread(
xfs_mount_t *mp, xfs_mount_t *mp,
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_inode_t *ip, xfs_inode_t *ip,
xfs_daddr_t bno,
uint iget_flags) uint iget_flags)
{ {
xfs_buf_t *bp; xfs_buf_t *bp;
@ -797,11 +796,9 @@ xfs_iread(
/* /*
* Fill in the location information in the in-core inode. * Fill in the location information in the in-core inode.
*/ */
ip->i_imap.im_blkno = bno;
error = xfs_imap(mp, tp, ip->i_ino, &ip->i_imap, iget_flags); error = xfs_imap(mp, tp, ip->i_ino, &ip->i_imap, iget_flags);
if (error) if (error)
return error; return error;
ASSERT(bno == 0 || bno == ip->i_imap.im_blkno);
/* /*
* Get pointers to the on-disk inode and the buffer containing it. * Get pointers to the on-disk inode and the buffer containing it.

4
fs/xfs/xfs_inode.h
View File

@ -442,7 +442,7 @@ static inline void xfs_ifunlock(xfs_inode_t *ip)
* xfs_iget.c prototypes. * xfs_iget.c prototypes.
*/ */
int xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t, int xfs_iget(struct xfs_mount *, struct xfs_trans *, xfs_ino_t,
uint, uint, xfs_inode_t **, xfs_daddr_t); uint, uint, xfs_inode_t **);
void xfs_iput(xfs_inode_t *, uint); void xfs_iput(xfs_inode_t *, uint);
void xfs_iput_new(xfs_inode_t *, uint); void xfs_iput_new(xfs_inode_t *, uint);
void xfs_ilock(xfs_inode_t *, uint); void xfs_ilock(xfs_inode_t *, uint);
@ -509,7 +509,7 @@ int xfs_itobp(struct xfs_mount *, struct xfs_trans *,
struct xfs_inode *, struct xfs_dinode **, struct xfs_inode *, struct xfs_dinode **,
struct xfs_buf **, uint); struct xfs_buf **, uint);
int xfs_iread(struct xfs_mount *, struct xfs_trans *, int xfs_iread(struct xfs_mount *, struct xfs_trans *,
struct xfs_inode *, xfs_daddr_t, uint); struct xfs_inode *, uint);
void xfs_dinode_to_disk(struct xfs_dinode *, void xfs_dinode_to_disk(struct xfs_dinode *,
struct xfs_icdinode *); struct xfs_icdinode *);
void xfs_idestroy_fork(struct xfs_inode *, int); void xfs_idestroy_fork(struct xfs_inode *, int);

12
fs/xfs/xfs_itable.c
View File

@ -60,7 +60,6 @@ xfs_bulkstat_one_int(
void __user *buffer, /* buffer to place output in */ void __user *buffer, /* buffer to place output in */
int ubsize, /* size of buffer */ int ubsize, /* size of buffer */
bulkstat_one_fmt_pf formatter, /* formatter, copy to user */ bulkstat_one_fmt_pf formatter, /* formatter, copy to user */
xfs_daddr_t bno, /* starting bno of cluster */
int *ubused, /* bytes used by me */ int *ubused, /* bytes used by me */
int *stat) /* BULKSTAT_RV_... */ int *stat) /* BULKSTAT_RV_... */
{ {
@ -80,7 +79,7 @@ xfs_bulkstat_one_int(
return XFS_ERROR(ENOMEM); return XFS_ERROR(ENOMEM);
error = xfs_iget(mp, NULL, ino, error = xfs_iget(mp, NULL, ino,
XFS_IGET_UNTRUSTED, XFS_ILOCK_SHARED, &ip, bno); XFS_IGET_UNTRUSTED, XFS_ILOCK_SHARED, &ip);
if (error) { if (error) {
*stat = BULKSTAT_RV_NOTHING; *stat = BULKSTAT_RV_NOTHING;
goto out_free; goto out_free;
@ -179,13 +178,11 @@ xfs_bulkstat_one(
xfs_ino_t ino, /* inode number to get data for */ xfs_ino_t ino, /* inode number to get data for */
void __user *buffer, /* buffer to place output in */ void __user *buffer, /* buffer to place output in */
int ubsize, /* size of buffer */ int ubsize, /* size of buffer */
xfs_daddr_t bno, /* starting bno of inode cluster */
int *ubused, /* bytes used by me */ int *ubused, /* bytes used by me */
int *stat) /* BULKSTAT_RV_... */ int *stat) /* BULKSTAT_RV_... */
{ {
return xfs_bulkstat_one_int(mp, ino, buffer, ubsize, return xfs_bulkstat_one_int(mp, ino, buffer, ubsize,
xfs_bulkstat_one_fmt, bno, xfs_bulkstat_one_fmt, ubused, stat);
ubused, stat);
} }
#define XFS_BULKSTAT_UBLEFT(ubleft) ((ubleft) >= statstruct_size) #define XFS_BULKSTAT_UBLEFT(ubleft) ((ubleft) >= statstruct_size)
@ -485,7 +482,7 @@ xfs_bulkstat(
* Get the inode and fill in a single buffer. * Get the inode and fill in a single buffer.
*/ */
ubused = statstruct_size; ubused = statstruct_size;
error = formatter(mp, ino, ubufp, ubleft, bno, error = formatter(mp, ino, ubufp, ubleft,
&ubused, &fmterror); &ubused, &fmterror);
if (fmterror == BULKSTAT_RV_NOTHING) { if (fmterror == BULKSTAT_RV_NOTHING) {
if (error && error != ENOENT && if (error && error != ENOENT &&
@ -578,8 +575,7 @@ xfs_bulkstat_single(
*/ */
ino = (xfs_ino_t)*lastinop; ino = (xfs_ino_t)*lastinop;
error = xfs_bulkstat_one(mp, ino, buffer, sizeof(xfs_bstat_t), error = xfs_bulkstat_one(mp, ino, buffer, sizeof(xfs_bstat_t), 0, &res);
0, NULL, &res);
if (error) { if (error) {
/* /*
* Special case way failed, do it the "long" way * Special case way failed, do it the "long" way

3
fs/xfs/xfs_itable.h
View File

@ -27,7 +27,6 @@ typedef int (*bulkstat_one_pf)(struct xfs_mount *mp,
xfs_ino_t ino, xfs_ino_t ino,
void __user *buffer, void __user *buffer,
int ubsize, int ubsize,
xfs_daddr_t bno,
int *ubused, int *ubused,
int *stat); int *stat);
@ -71,7 +70,6 @@ xfs_bulkstat_one_int(
void __user *buffer, void __user *buffer,
int ubsize, int ubsize,
bulkstat_one_fmt_pf formatter, bulkstat_one_fmt_pf formatter,
xfs_daddr_t bno,
int *ubused, int *ubused,
int *stat); int *stat);
@ -81,7 +79,6 @@ xfs_bulkstat_one(
xfs_ino_t ino, xfs_ino_t ino,
void __user *buffer, void __user *buffer,
int ubsize, int ubsize,
xfs_daddr_t bno,
int *ubused, int *ubused,
int *stat); int *stat);

2
fs/xfs/xfs_log_recover.c
View File

@ -3198,7 +3198,7 @@ xlog_recover_process_one_iunlink(
int error; int error;
ino = XFS_AGINO_TO_INO(mp, agno, agino); ino = XFS_AGINO_TO_INO(mp, agno, agino);
error = xfs_iget(mp, NULL, ino, 0, 0, &ip, 0); error = xfs_iget(mp, NULL, ino, 0, 0, &ip);
if (error) if (error)
goto fail; goto fail;

2
fs/xfs/xfs_mount.c
View File

@ -1300,7 +1300,7 @@ xfs_mountfs(
* Get and sanity-check the root inode. * Get and sanity-check the root inode.
* Save the pointer to it in the mount structure. * Save the pointer to it in the mount structure.
*/ */
error = xfs_iget(mp, NULL, sbp->sb_rootino, 0, XFS_ILOCK_EXCL, &rip, 0); error = xfs_iget(mp, NULL, sbp->sb_rootino, 0, XFS_ILOCK_EXCL, &rip);
if (error) { if (error) {
cmn_err(CE_WARN, "XFS: failed to read root inode"); cmn_err(CE_WARN, "XFS: failed to read root inode");
goto out_log_dealloc; goto out_log_dealloc;

4
fs/xfs/xfs_rtalloc.c
View File

@ -2277,12 +2277,12 @@ xfs_rtmount_inodes(
sbp = &mp->m_sb; sbp = &mp->m_sb;
if (sbp->sb_rbmino == NULLFSINO) if (sbp->sb_rbmino == NULLFSINO)
return 0; return 0;
error = xfs_iget(mp, NULL, sbp->sb_rbmino, 0, 0, &mp->m_rbmip, 0); error = xfs_iget(mp, NULL, sbp->sb_rbmino, 0, 0, &mp->m_rbmip);
if (error) if (error)
return error; return error;
ASSERT(mp->m_rbmip != NULL); ASSERT(mp->m_rbmip != NULL);
ASSERT(sbp->sb_rsumino != NULLFSINO); ASSERT(sbp->sb_rsumino != NULLFSINO);
error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip, 0); error = xfs_iget(mp, NULL, sbp->sb_rsumino, 0, 0, &mp->m_rsumip);
if (error) { if (error) {
IRELE(mp->m_rbmip); IRELE(mp->m_rbmip);
return error; return error;

2
fs/xfs/xfs_trans_inode.c
View File

@ -62,7 +62,7 @@ xfs_trans_iget(
{ {
int error; int error;
error = xfs_iget(mp, tp, ino, flags, lock_flags, ipp, 0); error = xfs_iget(mp, tp, ino, flags, lock_flags, ipp);
if (!error && tp) if (!error && tp)
xfs_trans_ijoin(tp, *ipp, lock_flags); xfs_trans_ijoin(tp, *ipp, lock_flags);
return error; return error;

2
fs/xfs/xfs_vnodeops.c
View File

@ -1269,7 +1269,7 @@ xfs_lookup(
if (error) if (error)
goto out; goto out;
error = xfs_iget(dp->i_mount, NULL, inum, 0, 0, ipp, 0); error = xfs_iget(dp->i_mount, NULL, inum, 0, 0, ipp);
if (error) if (error)
goto out_free_name; goto out_free_name;