Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 260720
b: refs/heads/master
c: abbede1
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Jul 26, 2011
1 parent 0f84f96 commit 991698c
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 35 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c46c887744b330795eba55fdb96343c36d481765
refs/heads/master: abbede1b3a680e108d61aaa415ce5153296e775d
4 changes: 2 additions & 2 deletions trunk/fs/xfs/linux-2.6/xfs_ioctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,14 +850,14 @@ xfs_set_diflags(
di_flags |= XFS_DIFLAG_NODEFRAG;
if (xflags & XFS_XFLAG_FILESTREAM)
di_flags |= XFS_DIFLAG_FILESTREAM;
if ((ip->i_d.di_mode & S_IFMT) == S_IFDIR) {
if (S_ISDIR(ip->i_d.di_mode)) {
if (xflags & XFS_XFLAG_RTINHERIT)
di_flags |= XFS_DIFLAG_RTINHERIT;
if (xflags & XFS_XFLAG_NOSYMLINKS)
di_flags |= XFS_DIFLAG_NOSYMLINKS;
if (xflags & XFS_XFLAG_EXTSZINHERIT)
di_flags |= XFS_DIFLAG_EXTSZINHERIT;
} else if ((ip->i_d.di_mode & S_IFMT) == S_IFREG) {
} else if (S_ISREG(ip->i_d.di_mode)) {
if (xflags & XFS_XFLAG_REALTIME)
di_flags |= XFS_DIFLAG_REALTIME;
if (xflags & XFS_XFLAG_EXTSIZE)
Expand Down
7 changes: 3 additions & 4 deletions trunk/fs/xfs/xfs_bmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ xfs_bmap_add_attrfork_local(

if (ip->i_df.if_bytes <= XFS_IFORK_DSIZE(ip))
return 0;
if ((ip->i_d.di_mode & S_IFMT) == S_IFDIR) {
if (S_ISDIR(ip->i_d.di_mode)) {
mp = ip->i_mount;
memset(&dargs, 0, sizeof(dargs));
dargs.dp = ip;
Expand Down Expand Up @@ -3344,8 +3344,7 @@ xfs_bmap_local_to_extents(
* We don't want to deal with the case of keeping inode data inline yet.
* So sending the data fork of a regular inode is invalid.
*/
ASSERT(!((ip->i_d.di_mode & S_IFMT) == S_IFREG &&
whichfork == XFS_DATA_FORK));
ASSERT(!(S_ISREG(ip->i_d.di_mode) && whichfork == XFS_DATA_FORK));
ifp = XFS_IFORK_PTR(ip, whichfork);
ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_LOCAL);
flags = 0;
Expand Down Expand Up @@ -4052,7 +4051,7 @@ xfs_bmap_one_block(

#ifndef DEBUG
if (whichfork == XFS_DATA_FORK) {
return ((ip->i_d.di_mode & S_IFMT) == S_IFREG) ?
return S_ISREG(ip->i_d.di_mode) ?
(ip->i_size == ip->i_mount->m_sb.sb_blocksize) :
(ip->i_d.di_size == ip->i_mount->m_sb.sb_blocksize);
}
Expand Down
16 changes: 8 additions & 8 deletions trunk/fs/xfs/xfs_dir2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ xfs_dir_isempty(
{
xfs_dir2_sf_hdr_t *sfp;

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));
if (dp->i_d.di_size == 0) /* might happen during shutdown. */
return 1;
if (dp->i_d.di_size > XFS_IFORK_DSIZE(dp))
Expand Down Expand Up @@ -179,7 +179,7 @@ xfs_dir_init(
memset((char *)&args, 0, sizeof(args));
args.dp = dp;
args.trans = tp;
ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));
if ((error = xfs_dir_ino_validate(tp->t_mountp, pdp->i_ino)))
return error;
return xfs_dir2_sf_create(&args, pdp->i_ino);
Expand All @@ -202,7 +202,7 @@ xfs_dir_createname(
int rval;
int v; /* type-checking value */

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));
if ((rval = xfs_dir_ino_validate(tp->t_mountp, inum)))
return rval;
XFS_STATS_INC(xs_dir_create);
Expand Down Expand Up @@ -278,7 +278,7 @@ xfs_dir_lookup(
int rval;
int v; /* type-checking value */

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));
XFS_STATS_INC(xs_dir_lookup);

memset(&args, 0, sizeof(xfs_da_args_t));
Expand Down Expand Up @@ -333,7 +333,7 @@ xfs_dir_removename(
int rval;
int v; /* type-checking value */

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));
XFS_STATS_INC(xs_dir_remove);

memset(&args, 0, sizeof(xfs_da_args_t));
Expand Down Expand Up @@ -382,7 +382,7 @@ xfs_readdir(
if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return XFS_ERROR(EIO);

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));
XFS_STATS_INC(xs_dir_getdents);

if (dp->i_d.di_format == XFS_DINODE_FMT_LOCAL)
Expand Down Expand Up @@ -414,7 +414,7 @@ xfs_dir_replace(
int rval;
int v; /* type-checking value */

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));

if ((rval = xfs_dir_ino_validate(tp->t_mountp, inum)))
return rval;
Expand Down Expand Up @@ -464,7 +464,7 @@ xfs_dir_canenter(
if (resblks)
return 0;

ASSERT((dp->i_d.di_mode & S_IFMT) == S_IFDIR);
ASSERT(S_ISDIR(dp->i_d.di_mode));

memset(&args, 0, sizeof(xfs_da_args_t));
args.name = name->name;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_filestream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ _xfs_filestream_update_ag(
* Either ip is a regular file and pip is a directory, or ip is a
* directory and pip is NULL.
*/
ASSERT(ip && (((ip->i_d.di_mode & S_IFREG) && pip &&
ASSERT(ip && ((S_ISREG(ip->i_d.di_mode) && pip &&
(pip->i_d.di_mode & S_IFDIR)) ||
((ip->i_d.di_mode & S_IFDIR) && !pip)));

Expand Down
16 changes: 8 additions & 8 deletions trunk/fs/xfs/xfs_inode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ xfs_iformat(
/*
* no local regular files yet
*/
if (unlikely((be16_to_cpu(dip->di_mode) & S_IFMT) == S_IFREG)) {
if (unlikely(S_ISREG(be16_to_cpu(dip->di_mode)))) {
xfs_warn(ip->i_mount,
"corrupt inode %Lu (local format for regular file).",
(unsigned long long) ip->i_ino);
Expand Down Expand Up @@ -1040,7 +1040,7 @@ xfs_ialloc(

if (pip && XFS_INHERIT_GID(pip)) {
ip->i_d.di_gid = pip->i_d.di_gid;
if ((pip->i_d.di_mode & S_ISGID) && (mode & S_IFMT) == S_IFDIR) {
if ((pip->i_d.di_mode & S_ISGID) && S_ISDIR(mode)) {
ip->i_d.di_mode |= S_ISGID;
}
}
Expand Down Expand Up @@ -1097,14 +1097,14 @@ xfs_ialloc(
if (pip && (pip->i_d.di_flags & XFS_DIFLAG_ANY)) {
uint di_flags = 0;

if ((mode & S_IFMT) == S_IFDIR) {
if (S_ISDIR(mode)) {
if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT)
di_flags |= XFS_DIFLAG_RTINHERIT;
if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {
di_flags |= XFS_DIFLAG_EXTSZINHERIT;
ip->i_d.di_extsize = pip->i_d.di_extsize;
}
} else if ((mode & S_IFMT) == S_IFREG) {
} else if (S_ISREG(mode)) {
if (pip->i_d.di_flags & XFS_DIFLAG_RTINHERIT)
di_flags |= XFS_DIFLAG_REALTIME;
if (pip->i_d.di_flags & XFS_DIFLAG_EXTSZINHERIT) {
Expand Down Expand Up @@ -1188,7 +1188,7 @@ xfs_isize_check(
int nimaps;
xfs_bmbt_irec_t imaps[2];

if ((ip->i_d.di_mode & S_IFMT) != S_IFREG)
if (!S_ISREG(ip->i_d.di_mode))
return;

if (XFS_IS_REALTIME_INODE(ip))
Expand Down Expand Up @@ -1828,7 +1828,7 @@ xfs_ifree(
ASSERT(ip->i_d.di_nextents == 0);
ASSERT(ip->i_d.di_anextents == 0);
ASSERT((ip->i_d.di_size == 0 && ip->i_size == 0) ||
((ip->i_d.di_mode & S_IFMT) != S_IFREG));
(!S_ISREG(ip->i_d.di_mode)));
ASSERT(ip->i_d.di_nblocks == 0);

/*
Expand Down Expand Up @@ -2671,7 +2671,7 @@ xfs_iflush_int(
__func__, ip->i_ino, ip, ip->i_d.di_magic);
goto corrupt_out;
}
if ((ip->i_d.di_mode & S_IFMT) == S_IFREG) {
if (S_ISREG(ip->i_d.di_mode)) {
if (XFS_TEST_ERROR(
(ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) &&
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE),
Expand All @@ -2681,7 +2681,7 @@ xfs_iflush_int(
__func__, ip->i_ino, ip);
goto corrupt_out;
}
} else if ((ip->i_d.di_mode & S_IFMT) == S_IFDIR) {
} else if (S_ISDIR(ip->i_d.di_mode)) {
if (XFS_TEST_ERROR(
(ip->i_d.di_format != XFS_DINODE_FMT_EXTENTS) &&
(ip->i_d.di_format != XFS_DINODE_FMT_BTREE) &&
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_inode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ typedef struct xfs_inode {
struct inode i_vnode; /* embedded VFS inode */
} xfs_inode_t;

#define XFS_ISIZE(ip) (((ip)->i_d.di_mode & S_IFMT) == S_IFREG) ? \
#define XFS_ISIZE(ip) S_ISREG((ip)->i_d.di_mode) ? \
(ip)->i_size : (ip)->i_d.di_size;

/* Convert from vfs inode to xfs inode */
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/xfs/xfs_log_recover.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2283,7 +2283,7 @@ xlog_recover_inode_pass2(
/* Take the opportunity to reset the flush iteration count */
dicp->di_flushiter = 0;

if (unlikely((dicp->di_mode & S_IFMT) == S_IFREG)) {
if (unlikely(S_ISREG(dicp->di_mode))) {
if ((dicp->di_format != XFS_DINODE_FMT_EXTENTS) &&
(dicp->di_format != XFS_DINODE_FMT_BTREE)) {
XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(3)",
Expand All @@ -2296,7 +2296,7 @@ xlog_recover_inode_pass2(
error = EFSCORRUPTED;
goto error;
}
} else if (unlikely((dicp->di_mode & S_IFMT) == S_IFDIR)) {
} else if (unlikely(S_ISDIR(dicp->di_mode))) {
if ((dicp->di_format != XFS_DINODE_FMT_EXTENTS) &&
(dicp->di_format != XFS_DINODE_FMT_BTREE) &&
(dicp->di_format != XFS_DINODE_FMT_LOCAL)) {
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_mount.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ xfs_mountfs(

ASSERT(rip != NULL);

if (unlikely((rip->i_d.di_mode & S_IFMT) != S_IFDIR)) {
if (unlikely(!S_ISDIR(rip->i_d.di_mode))) {
xfs_warn(mp, "corrupted root inode %llu: not a directory",
(unsigned long long)rip->i_ino);
xfs_iunlock(rip, XFS_ILOCK_EXCL);
Expand Down
4 changes: 2 additions & 2 deletions trunk/fs/xfs/xfs_rename.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ xfs_rename(
trace_xfs_rename(src_dp, target_dp, src_name, target_name);

new_parent = (src_dp != target_dp);
src_is_directory = ((src_ip->i_d.di_mode & S_IFMT) == S_IFDIR);
src_is_directory = S_ISDIR(src_ip->i_d.di_mode);

if (src_is_directory) {
/*
Expand Down Expand Up @@ -226,7 +226,7 @@ xfs_rename(
* target and source are directories and that target can be
* destroyed, or that neither is a directory.
*/
if ((target_ip->i_d.di_mode & S_IFMT) == S_IFDIR) {
if (S_ISDIR(target_ip->i_d.di_mode)) {
/*
* Make sure target dir is empty.
*/
Expand Down
10 changes: 5 additions & 5 deletions trunk/fs/xfs/xfs_vnodeops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ xfs_readlink(

xfs_ilock(ip, XFS_ILOCK_SHARED);

ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFLNK);
ASSERT(S_ISLNK(ip->i_d.di_mode));
ASSERT(ip->i_d.di_size <= MAXPATHLEN);

pathlen = ip->i_d.di_size;
Expand Down Expand Up @@ -529,7 +529,7 @@ xfs_release(
if (ip->i_d.di_nlink == 0)
return 0;

if ((((ip->i_d.di_mode & S_IFMT) == S_IFREG) &&
if ((S_ISREG(ip->i_d.di_mode) &&
((ip->i_size > 0) || (VN_CACHED(VFS_I(ip)) > 0 ||
ip->i_delayed_blks > 0)) &&
(ip->i_df.if_flags & XFS_IFEXTENTS)) &&
Expand Down Expand Up @@ -610,7 +610,7 @@ xfs_inactive(
truncate = ((ip->i_d.di_nlink == 0) &&
((ip->i_d.di_size != 0) || (ip->i_size != 0) ||
(ip->i_d.di_nextents > 0) || (ip->i_delayed_blks > 0)) &&
((ip->i_d.di_mode & S_IFMT) == S_IFREG));
S_ISREG(ip->i_d.di_mode));

mp = ip->i_mount;

Expand All @@ -621,7 +621,7 @@ xfs_inactive(
goto out;

if (ip->i_d.di_nlink != 0) {
if ((((ip->i_d.di_mode & S_IFMT) == S_IFREG) &&
if ((S_ISREG(ip->i_d.di_mode) &&
((ip->i_size > 0) || (VN_CACHED(VFS_I(ip)) > 0 ||
ip->i_delayed_blks > 0)) &&
(ip->i_df.if_flags & XFS_IFEXTENTS) &&
Expand Down Expand Up @@ -669,7 +669,7 @@ xfs_inactive(
xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL);
return VN_INACTIVE_CACHE;
}
} else if ((ip->i_d.di_mode & S_IFMT) == S_IFLNK) {
} else if (S_ISLNK(ip->i_d.di_mode)) {

/*
* If we get an error while cleaning up a
Expand Down

0 comments on commit 991698c

Please sign in to comment.