diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-09-28 11:01:22 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-09-28 11:01:22 +1000 |
| commit | 69e23b9a5e7430ced667d8b699330e370c202f28 (patch) | |
| tree | 9a3cf3d783adf98b9f76c354e7da6de1bfbb70b3 | |
| parent | 29b6d22b011d83dac8ca5b7d26f766ae598abbbd (diff) | |
| download | kernel_samsung_aries-69e23b9a5e7430ced667d8b699330e370c202f28.zip kernel_samsung_aries-69e23b9a5e7430ced667d8b699330e370c202f28.tar.gz kernel_samsung_aries-69e23b9a5e7430ced667d8b699330e370c202f28.tar.bz2 | |
[XFS] Update XFS for i_blksize removal from generic inode structure
SGI-PV: 954366
SGI-Modid: xfs-linux-melb:xfs-kern:26565a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_iops.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 22e3b71..3ba814a 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c @@ -623,12 +623,27 @@ xfs_vn_getattr( { struct inode *inode = dentry->d_inode; bhv_vnode_t *vp = vn_from_inode(inode); - int error = 0; + bhv_vattr_t vattr = { .va_mask = XFS_AT_STAT }; + int error; - if (unlikely(vp->v_flag & VMODIFIED)) - error = vn_revalidate(vp); - if (!error) - generic_fillattr(inode, stat); + error = bhv_vop_getattr(vp, &vattr, ATTR_LAZY, NULL); + if (likely(!error)) { + stat->size = i_size_read(inode); + stat->dev = inode->i_sb->s_dev; + stat->rdev = (vattr.va_rdev == 0) ? 0 : + MKDEV(sysv_major(vattr.va_rdev) & 0x1ff, + sysv_minor(vattr.va_rdev)); + stat->mode = vattr.va_mode; + stat->nlink = vattr.va_nlink; + stat->uid = vattr.va_uid; + stat->gid = vattr.va_gid; + stat->ino = vattr.va_nodeid; + stat->atime = vattr.va_atime; + stat->mtime = vattr.va_mtime; + stat->ctime = vattr.va_ctime; + stat->blocks = vattr.va_nblocks; + stat->blksize = vattr.va_blocksize; + } return -error; } |