Page MenuHomeFreeBSD
Differential D29929 Diff 88772 sys/fs/ext2fs/ext2_vnops.c

Changeset View

Standalone View

View Options

sys/fs/ext2fs/ext2_vnops.c

Show First 20 Lines • Show All 371 Lines • ▼ Show 20 Linesext2_getattr(struct vop_getattr_args *ap)
vap->va_rdev = ip->i_rdev; vap->va_rdev = ip->i_rdev;
vap->va_size = ip->i_size; vap->va_size = ip->i_size;
vap->va_atime.tv_sec = ip->i_atime; vap->va_atime.tv_sec = ip->i_atime;
vap->va_atime.tv_nsec = E2DI_HAS_XTIME(ip) ? ip->i_atimensec : 0; vap->va_atime.tv_nsec = E2DI_HAS_XTIME(ip) ? ip->i_atimensec : 0;
vap->va_mtime.tv_sec = ip->i_mtime; vap->va_mtime.tv_sec = ip->i_mtime;
vap->va_mtime.tv_nsec = E2DI_HAS_XTIME(ip) ? ip->i_mtimensec : 0; vap->va_mtime.tv_nsec = E2DI_HAS_XTIME(ip) ? ip->i_mtimensec : 0;
vap->va_ctime.tv_sec = ip->i_ctime; vap->va_ctime.tv_sec = ip->i_ctime;
vap->va_ctime.tv_nsec = E2DI_HAS_XTIME(ip) ? ip->i_ctimensec : 0; vap->va_ctime.tv_nsec = E2DI_HAS_XTIME(ip) ? ip->i_ctimensec : 0;
if E2DI_HAS_XTIME(ip) { if (E2DI_HAS_XTIME(ip)) {
pfgUnsubmitted
Not Done
Inline Actions

Not needed because the macro has parenthesis already (standard practice).

pfg: Not needed because the macro has parenthesis already (standard practice).
fsuAuthorUnsubmitted
Not Done
Inline Actions

May be let's leave it as is. The concern is, that if expression without braces looks strange. Also, we have same if expressions with braces in the ext2_inode_cnv.c.

fsu: May be let's leave it as is. The concern is, that if expression without braces looks strange.
vap->va_birthtime.tv_sec = ip->i_birthtime; vap->va_birthtime.tv_sec = ip->i_birthtime;
vap->va_birthtime.tv_nsec = ip->i_birthnsec; vap->va_birthtime.tv_nsec = ip->i_birthnsec;
} }
vap->va_flags = ip->i_flags; vap->va_flags = ip->i_flags;
vap->va_gen = ip->i_gen; vap->va_gen = ip->i_gen;
vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize; vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
vap->va_bytes = dbtob((u_quad_t)ip->i_blocks); vap->va_bytes = dbtob((u_quad_t)ip->i_blocks);
vap->va_type = IFTOVT(ip->i_mode); vap->va_type = IFTOVT(ip->i_mode);
▲ Show 20 Lines • Show All 112 Lines • ▼ Show 20 Lines if (vap->va_atime.tv_sec != VNOVAL) {
ip->i_atime = vap->va_atime.tv_sec; ip->i_atime = vap->va_atime.tv_sec;
ip->i_atimensec = vap->va_atime.tv_nsec; ip->i_atimensec = vap->va_atime.tv_nsec;
} }
if (vap->va_mtime.tv_sec != VNOVAL) { if (vap->va_mtime.tv_sec != VNOVAL) {
ip->i_flag &= ~IN_UPDATE; ip->i_flag &= ~IN_UPDATE;
ip->i_mtime = vap->va_mtime.tv_sec; ip->i_mtime = vap->va_mtime.tv_sec;
ip->i_mtimensec = vap->va_mtime.tv_nsec; ip->i_mtimensec = vap->va_mtime.tv_nsec;
} }
if (E2DI_HAS_XTIME(ip) && vap->va_birthtime.tv_sec != VNOVAL) {
ip->i_birthtime = vap->va_birthtime.tv_sec; ip->i_birthtime = vap->va_birthtime.tv_sec;
ip->i_birthnsec = vap->va_birthtime.tv_nsec; ip->i_birthnsec = vap->va_birthtime.tv_nsec;
}
pfgUnsubmitted
Not Done
Inline Actions

Invert the order: whe should verify if E2DI_AS_XTIME first and only then check for VNOVAL.

pfg: Invert the order: whe should verify if E2DI_AS_XTIME first and only then check for VNOVAL.
error = ext2_update(vp, 0); error = ext2_update(vp, 0);
if (error) if (error)
return (error); return (error);
} }
error = 0; error = 0;
if (vap->va_mode != (mode_t)VNOVAL) { if (vap->va_mode != (mode_t)VNOVAL) {
if (vp->v_mount->mnt_flag & MNT_RDONLY) if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS); return (EROFS);
▲ Show 20 Lines • Show All 1,837 Lines • Show Last 20 Lines