tmp_dentry = lookup_one_len(name, lower_dentry->d_parent,
nlen);
- if (unlikely(IS_ERR(tmp_dentry))) {
+ if (IS_ERR(tmp_dentry)) {
err = PTR_ERR(tmp_dentry);
goto out;
}
err = copyup_named_file(dentry->d_parent->d_inode, file, name, bstart,
bindex, file->f_path.dentry->d_inode->i_size);
- if (unlikely(err)) {
+ if (err) {
if (unlikely(err == -EEXIST))
goto retry;
goto out;
unlock_dir(lower_dir_dentry);
out:
- if (likely(!err))
+ if (!err)
unionfs_check_dentry(dentry);
return err;
}
dentry_open(lower_dentry,
unionfs_lower_mnt_idx(dentry, bindex),
file->f_flags);
- if (unlikely(IS_ERR(lower_file))) {
+ if (IS_ERR(lower_file)) {
err = PTR_ERR(lower_file);
goto out;
} else
for (bindex = bstart - 1; bindex >= 0; bindex--) {
err = copyup_file(parent_inode, file, bstart, bindex,
inode_size);
- if (likely(!err))
+ if (!err)
break;
}
atomic_set(&UNIONFS_F(file)->generation,
lower_file = dentry_open(lower_dentry,
unionfs_lower_mnt_idx(dentry, bstart),
file->f_flags);
- if (unlikely(IS_ERR(lower_file))) {
+ if (IS_ERR(lower_file)) {
err = PTR_ERR(lower_file);
goto out;
}
unionfs_check_file(file);
unionfs_check_dentry(dentry);
for (bindex = bstart - 1; bindex >= 0; bindex--) {
- if (likely(!d_deleted(dentry)))
+ if (!d_deleted(dentry))
err = copyup_file(parent_inode, file, bstart,
bindex, inode_size);
else
err = copyup_deleted_file(file, dentry, bstart,
bindex);
- if (likely(!err))
+ if (!err)
break;
}
- if (unlikely(err || (bstart <= fbstart(file))))
+ if (err || (bstart <= fbstart(file)))
goto out;
bend = fbend(file);
for (bindex = bstart; bindex <= bend; bindex++) {
if (S_ISDIR(dentry->d_inode->i_mode)) {
/* We need to open all the files. */
err = open_all_files(file);
- if (unlikely(err))
+ if (err)
goto out;
} else {
int new_brid;
/* We only open the highest priority branch. */
err = open_highest_file(file, willwrite);
- if (unlikely(err))
+ if (err)
goto out;
new_brid = UNIONFS_F(file)->
saved_branch_ids[fbstart(file)];
}
out:
- if (unlikely(err)) {
+ if (err) {
kfree(UNIONFS_F(file)->lower_files);
kfree(UNIONFS_F(file)->saved_branch_ids);
}
out_nofree:
- if (unlikely(!err))
+ if (!err)
unionfs_check_file(file);
unionfs_unlock_dentry(dentry);
return err;
for (bindex = bstart; bindex <= bend; bindex++) {
lower_dentry =
unionfs_lower_dentry_idx(file->f_path.dentry, bindex);
- if (unlikely(!lower_dentry))
+ if (!lower_dentry)
continue;
dget(lower_dentry);
unionfs_lower_mnt_idx(file->f_path.dentry,
bindex),
file->f_flags);
- if (unlikely(IS_ERR(lower_file)))
+ if (IS_ERR(lower_file))
return PTR_ERR(lower_file);
unionfs_set_lower_file_idx(file, bindex, lower_file);
err = copyup_file(
file->f_path.dentry->d_parent->d_inode,
file, bstart, bindex, size);
- if (likely(!err))
+ if (!err)
break;
}
return err;
dentry_open(lower_dentry,
unionfs_lower_mnt_idx(file->f_path.dentry, bstart),
lower_flags);
- if (unlikely(IS_ERR(lower_file)))
+ if (IS_ERR(lower_file))
return PTR_ERR(lower_file);
unionfs_set_lower_file(file, lower_file);
err = __open_file(inode, file); /* open a file */
/* freeing the allocated resources, and fput the opened files */
- if (unlikely(err)) {
+ if (err) {
atomic_dec(&UNIONFS_I(dentry->d_inode)->totalopens);
for (bindex = bstart; bindex <= bend; bindex++) {
lower_file = unionfs_lower_file_idx(file, bindex);
- if (unlikely(!lower_file))
+ if (!lower_file)
continue;
branchput(file->f_path.dentry->d_sb, bindex);
unionfs_unlock_dentry(dentry);
out:
- if (unlikely(err)) {
+ if (err) {
kfree(UNIONFS_F(file)->lower_files);
kfree(UNIONFS_F(file)->saved_branch_ids);
kfree(UNIONFS_F(file));
out_nofree:
unionfs_read_unlock(inode->i_sb);
unionfs_check_inode(inode);
- if (likely(!err)) {
+ if (!err) {
unionfs_check_file(file);
unionfs_check_dentry(file->f_path.dentry->d_parent);
}
for (bindex = bstart; bindex <= bend; bindex++) {
lower_file = unionfs_lower_file_idx(file, bindex);
- if (likely(lower_file)) {
+ if (lower_file) {
fput(lower_file);
branchput(sb, bindex);
}
kfree(fileinfo->lower_files);
kfree(fileinfo->saved_branch_ids);
- if (unlikely(fileinfo->rdstate)) {
+ if (fileinfo->rdstate) {
fileinfo->rdstate->access = jiffies;
printk(KERN_DEBUG "unionfs: saving rdstate with cookie "
"%u [%d.%lld]\n",
lower_file = unionfs_lower_file(file);
err = security_file_ioctl(lower_file, cmd, arg);
- if (unlikely(err))
+ if (err)
goto out;
err = -ENOTTY;
- if (unlikely(!lower_file || !lower_file->f_op))
+ if (!lower_file || !lower_file->f_op)
goto out;
if (lower_file->f_op->unlocked_ioctl) {
err = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);
- } else if (likely(lower_file->f_op->ioctl)) {
+ } else if (lower_file->f_op->ioctl) {
lock_kernel();
err = lower_file->f_op->ioctl(lower_file->f_path.dentry->d_inode,
lower_file, cmd, arg);
unionfs_lock_dentry(dentry);
orig_bstart = dbstart(dentry);
orig_bend = dbend(dentry);
- if (unlikely((err = unionfs_partial_lookup(dentry))))
+ if ((err = unionfs_partial_lookup(dentry)))
goto out;
bstart = dbstart(dentry);
bend = dbend(dentry);
for (bindex = bstart; bindex <= bend; bindex++) {
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- if (unlikely(!lower_dentry))
+ if (!lower_dentry)
continue;
if (likely(lower_dentry->d_inode))
FD_SET(bindex, &branchlist);
unionfs_set_lower_inode_idx(dentry->d_inode, bindex,
NULL);
mnt = unionfs_lower_mnt_idx(dentry, bindex);
- if (unlikely(!mnt))
+ if (!mnt)
continue;
unionfs_mntput(dentry, bindex);
unionfs_set_lower_mnt_idx(dentry, bindex, NULL);
if (lower_file && lower_file->f_op &&
lower_file->f_op->flush) {
err = lower_file->f_op->flush(lower_file, id);
- if (unlikely(err))
+ if (err)
goto out_lock;
/* if there are no more refs to the dentry, dput it */
/* query the actual size of the xattr list */
list_size = vfs_listxattr(old_lower_dentry, NULL, 0);
- if (unlikely(list_size <= 0)) {
+ if (list_size <= 0) {
err = list_size;
goto out;
}
/* now get the actual xattr list of the source file */
list_size = vfs_listxattr(old_lower_dentry, name_list, list_size);
- if (unlikely(list_size <= 0)) {
+ if (list_size <= 0) {
err = list_size;
goto out;
}
size = vfs_getxattr(old_lower_dentry, name_list,
attr_value, XATTR_SIZE_MAX);
mutex_unlock(&old_lower_dentry->d_inode->i_mutex);
- if (unlikely(size < 0)) {
+ if (size < 0) {
err = size;
goto out;
}
- if (unlikely(size > XATTR_SIZE_MAX)) {
+ if (size > XATTR_SIZE_MAX) {
err = -E2BIG;
goto out;
}
* temporarily get FOWNER privileges.
* XXX: move entire copyup code to SIOQ.
*/
- if (unlikely(err == -EPERM && !capable(CAP_FOWNER))) {
+ if (err == -EPERM && !capable(CAP_FOWNER)) {
cap_raise(current->cap_effective, CAP_FOWNER);
err = vfs_setxattr(new_lower_dentry, name_list,
attr_value, size, 0);
cap_lower(current->cap_effective, CAP_FOWNER);
}
- if (unlikely(err < 0))
+ if (err < 0)
goto out;
name_list += strlen(name_list) + 1;
}
unionfs_xattr_kfree(name_list_buf);
unionfs_xattr_kfree(attr_value);
/* Ignore if xattr isn't supported */
- if (unlikely(err == -ENOTSUPP || err == -EOPNOTSUPP))
+ if (err == -ENOTSUPP || err == -EOPNOTSUPP)
err = 0;
return err;
}
ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_FORCE |
ATTR_GID | ATTR_UID;
err = notify_change(new_lower_dentry, &newattrs);
- if (unlikely(err))
+ if (err)
goto out;
/* now try to change the mode and ignore EOPNOTSUPP on symlinks */
newattrs.ia_mode = i->i_mode;
newattrs.ia_valid = ATTR_MODE | ATTR_FORCE;
err = notify_change(new_lower_dentry, &newattrs);
- if (unlikely(err == -EOPNOTSUPP &&
- S_ISLNK(new_lower_dentry->d_inode->i_mode))) {
+ if (err == -EOPNOTSUPP &&
+ S_ISLNK(new_lower_dentry->d_inode->i_mode)) {
printk(KERN_WARNING
"unionfs: changing \"%s\" symlink mode unsupported\n",
new_lower_dentry->d_name.name);
run_sioq(__unionfs_mkdir, &args);
err = args.err;
- } else if (unlikely(S_ISLNK(old_mode))) {
+ } else if (S_ISLNK(old_mode)) {
args.symlink.parent = new_lower_parent_dentry->d_inode;
args.symlink.dentry = new_lower_dentry;
args.symlink.symbuf = symbuf;
run_sioq(__unionfs_symlink, &args);
err = args.err;
- } else if (unlikely(S_ISBLK(old_mode) || S_ISCHR(old_mode) ||
- S_ISFIFO(old_mode) || S_ISSOCK(old_mode))) {
+ } else if (S_ISBLK(old_mode) || S_ISCHR(old_mode) ||
+ S_ISFIFO(old_mode) || S_ISSOCK(old_mode)) {
args.mknod.parent = new_lower_parent_dentry->d_inode;
args.mknod.dentry = new_lower_dentry;
args.mknod.mode = old_mode;
input_file = dentry_open(old_lower_dentry,
unionfs_lower_mnt_idx(dentry, old_bindex),
O_RDONLY | O_LARGEFILE);
- if (unlikely(IS_ERR(input_file))) {
+ if (IS_ERR(input_file)) {
dput(old_lower_dentry);
err = PTR_ERR(input_file);
goto out;
branchget(sb, new_bindex);
output_file = dentry_open(new_lower_dentry, output_mnt,
O_RDWR | O_LARGEFILE);
- if (unlikely(IS_ERR(output_file))) {
+ if (IS_ERR(output_file)) {
err = PTR_ERR(output_file);
goto out_close_in2;
}
(char __user *)buf,
read_bytes,
&output_file->f_pos);
- if (unlikely((write_bytes < 0) || (write_bytes < read_bytes))) {
+ if ((write_bytes < 0) || (write_bytes < read_bytes)) {
err = write_bytes;
break;
}
kfree(buf);
- if (likely(!err))
+ if (!err)
err = output_file->f_op->fsync(output_file,
new_lower_dentry, 0);
- if (unlikely(err))
+ if (err)
goto out_close_out;
if (copyup_file) {
/* Create the directory structure above this dentry. */
new_lower_dentry = create_parents(dir, dentry, name, new_bindex);
- if (unlikely(IS_ERR(new_lower_dentry))) {
+ if (IS_ERR(new_lower_dentry)) {
err = PTR_ERR(new_lower_dentry);
goto out;
}
dget(old_lower_dentry);
/* For symlinks, we must read the link before we lock the directory. */
- if (unlikely(S_ISLNK(old_lower_dentry->d_inode->i_mode))) {
+ if (S_ISLNK(old_lower_dentry->d_inode->i_mode)) {
symbuf = kmalloc(PATH_MAX, GFP_KERNEL);
if (unlikely(!symbuf)) {
(char __user *)symbuf,
PATH_MAX);
set_fs(oldfs);
- if (unlikely(err < 0)) {
+ if (err < 0) {
__clear(dentry, old_lower_dentry,
old_bstart, old_bend,
new_lower_dentry, new_bindex);
err = __copyup_ndentry(old_lower_dentry, new_lower_dentry,
new_lower_parent_dentry, symbuf);
- if (unlikely(err)) {
+ if (err) {
__clear(dentry, old_lower_dentry,
old_bstart, old_bend,
new_lower_dentry, new_bindex);
err = __copyup_reg_data(dentry, new_lower_dentry, new_bindex,
old_lower_dentry, old_bindex,
copyup_file, len);
- if (unlikely(err))
+ if (err)
goto out_unlink;
/* Set permissions. */
- if (unlikely((err = copyup_permissions(sb, old_lower_dentry,
- new_lower_dentry))))
+ if ((err = copyup_permissions(sb, old_lower_dentry,
+ new_lower_dentry)))
goto out_unlink;
#ifdef CONFIG_UNION_FS_XATTR
/* Selinux uses extended attributes for permissions. */
- if (unlikely((err = copyup_xattrs(old_lower_dentry, new_lower_dentry))))
+ if ((err = copyup_xattrs(old_lower_dentry, new_lower_dentry)))
goto out_unlink;
#endif /* CONFIG_UNION_FS_XATTR */
/* do not allow files getting deleted to be re-interposed */
- if (likely(!d_deleted(dentry)))
+ if (!d_deleted(dentry))
unionfs_reinterpose(dentry);
goto out_unlock;
dput(old_lower_dentry);
kfree(symbuf);
- if (unlikely(err))
+ if (err)
goto out;
if (!S_ISDIR(dentry->d_inode->i_mode)) {
unionfs_postcopyup_release(dentry);
- if (unlikely(!unionfs_lower_inode(dentry->d_inode))) {
+ if (!unionfs_lower_inode(dentry->d_inode)) {
/*
* If we got here, then we copied up to an
* unlinked-open file, whose name is .unionfsXXXXX.
err = copyup_dentry(dir, file->f_path.dentry, bstart, new_bindex,
name, strlen(name), &output_file, len);
- if (likely(!err)) {
+ if (!err) {
fbstart(file) = new_bindex;
unionfs_set_lower_file_idx(file, new_bindex, output_file);
}
err = copyup_dentry(dir, dentry, bstart, new_bindex,
dentry->d_name.name, dentry->d_name.len,
&output_file, len);
- if (likely(!err)) {
+ if (!err) {
fbstart(file) = new_bindex;
unionfs_set_lower_file_idx(file, new_bindex, output_file);
}
* dentries except bindex
*/
for (i = loop_start; i <= loop_end; i++) {
- if (unlikely(!unionfs_lower_dentry_idx(dentry, i)))
+ if (!unionfs_lower_dentry_idx(dentry, i))
continue;
if (i == bindex) {
}
}
- if (unlikely(new_bstart < 0))
+ if (new_bstart < 0)
new_bstart = bindex;
- if (unlikely(new_bend < 0))
+ if (new_bend < 0)
new_bend = bindex;
set_dbstart(dentry, new_bstart);
set_dbend(dentry, new_bend);
verify_locked(dentry);
- if (unlikely((err = is_robranch_super(dir->i_sb, bindex)))) {
+ if ((err = is_robranch_super(dir->i_sb, bindex))) {
lower_dentry = ERR_PTR(err);
goto out;
}
unionfs_lower_dentry_idx(parent_dentry, bindex);
/* grow path table */
- if (unlikely(count == nr_dentry)) {
+ if (count == nr_dentry) {
void *p;
nr_dentry *= 2;
/* lookup child in the underlying file system */
lower_dentry = lookup_one_len(childname, lower_parent_dentry,
childnamelen);
- if (unlikely(IS_ERR(lower_dentry)))
+ if (IS_ERR(lower_dentry))
goto out;
} else {
/*
*/
lower_dentry = lookup_one_len(name, lower_parent_dentry,
strlen(name));
- if (unlikely(IS_ERR(lower_dentry)))
+ if (IS_ERR(lower_dentry))
goto out;
/* Replace the current dentry (if any) with the new one */
run_sioq(__unionfs_mkdir, &args);
err = args.err;
- if (likely(!err))
+ if (!err)
err = copyup_permissions(dir->i_sb, child_dentry,
lower_dentry);
unlock_dir(lower_parent_dentry);
- if (unlikely(err)) {
+ if (err) {
struct inode *inode = lower_dentry->d_inode;
/*
* If we get here, it means that we created a new
goto begin;
out:
/* cleanup any leftover locks from the do/while loop above */
- if (unlikely(IS_ERR(lower_dentry)))
+ if (IS_ERR(lower_dentry))
while (count)
unionfs_unlock_dentry(path[count--]);
kfree(path);
struct dentry *parent, *hasone;
int bindex = dbstart(dentry);
- if (unlikely(unionfs_lower_mnt_idx(dentry, bindex)))
+ if (unionfs_lower_mnt_idx(dentry, bindex))
return;
hasone = dentry->d_parent;
/* this loop should stop at root dentry */
verify_locked(dentry);
/* if the dentry is unhashed, do NOT revalidate */
- if (unlikely(d_deleted(dentry))) {
+ if (d_deleted(dentry)) {
dprintk(KERN_DEBUG "unionfs: unhashed dentry being "
"revalidated: %*s\n",
dentry->d_name.len, dentry->d_name.name);
}
BUG_ON(dbstart(dentry) == -1);
- if (likely(dentry->d_inode))
+ if (dentry->d_inode)
positive = 1;
dgen = atomic_read(&UNIONFS_D(dentry)->generation);
sbgen = atomic_read(&UNIONFS_SB(dentry->d_sb)->generation);
/* Free the pointers for our inodes and this dentry. */
bstart = dbstart(dentry);
bend = dbend(dentry);
- if (likely(bstart >= 0)) {
+ if (bstart >= 0) {
struct dentry *lower_dentry;
for (bindex = bstart; bindex <= bend; bindex++) {
lower_dentry =
set_dbend(dentry, -1);
interpose_flag = INTERPOSE_REVAL_NEG;
- if (likely(positive)) {
+ if (positive) {
interpose_flag = INTERPOSE_REVAL;
/*
* During BRM, the VFS could already hold a lock on
* (deadlock), but if you lock it in this function,
* then release it here too.
*/
- if (unlikely(!mutex_is_locked(&dentry->d_inode->i_mutex))) {
+ if (!mutex_is_locked(&dentry->d_inode->i_mutex)) {
mutex_lock(&dentry->d_inode->i_mutex);
locked = 1;
}
bstart = ibstart(dentry->d_inode);
bend = ibend(dentry->d_inode);
- if (likely(bstart >= 0)) {
+ if (bstart >= 0) {
struct inode *lower_inode;
for (bindex = bstart; bindex <= bend;
bindex++) {
UNIONFS_I(dentry->d_inode)->lower_inodes = NULL;
ibstart(dentry->d_inode) = -1;
ibend(dentry->d_inode) = -1;
- if (unlikely(locked))
+ if (locked)
mutex_unlock(&dentry->d_inode->i_mutex);
}
result = unionfs_lookup_backend(dentry, &lowernd,
interpose_flag);
- if (likely(result)) {
- if (unlikely(IS_ERR(result))) {
+ if (result) {
+ if (IS_ERR(result)) {
valid = false;
goto out;
}
BUG_ON(bstart == -1);
for (bindex = bstart; bindex <= bend; bindex++) {
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- if (unlikely(!lower_dentry || !lower_dentry->d_op
- || !lower_dentry->d_op->d_revalidate))
+ if (!lower_dentry || !lower_dentry->d_op
+ || !lower_dentry->d_op->d_revalidate)
continue;
- if (unlikely(!lower_dentry->d_op->d_revalidate(lower_dentry,
- &lowernd)))
+ if (!lower_dentry->d_op->d_revalidate(lower_dentry,
+ &lowernd))
valid = false;
}
- if (unlikely(!dentry->d_inode))
+ if (!dentry->d_inode)
valid = false;
- if (likely(valid)) {
+ if (valid) {
/*
* If we get here, and we copy the meta-data from the lower
* inode to our inode, then it is vital that we have already
struct inode *lower_inode;
/* ignore if we're called on semi-initialized dentries/inodes */
- if (likely(!dentry || !UNIONFS_D(dentry)))
+ if (!dentry || !UNIONFS_D(dentry))
return false;
inode = dentry->d_inode;
- if (unlikely(!inode || !UNIONFS_I(inode) ||
- ibstart(inode) < 0 || ibend(inode) < 0))
+ if (!inode || !UNIONFS_I(inode) ||
+ ibstart(inode) < 0 || ibend(inode) < 0)
return false;
for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) {
lower_inode = unionfs_lower_inode_idx(inode, bindex);
- if (unlikely(!lower_inode))
+ if (!lower_inode)
continue;
/*
* We may want to apply other tests to determine if the
/* finally, lock this dentry and revalidate it */
verify_locked(dentry);
dgen = atomic_read(&UNIONFS_D(dentry)->generation);
+
if (unlikely(is_newer_lower(dentry))) {
/* root dentry special case as aforementioned */
if (IS_ROOT(dentry))
* which __unionfs_d_revalidate_one has incremented. Note: the "if"
* test below does not depend on whether chain_len was 0 or greater.
*/
- if (unlikely(valid && sbgen != dgen))
+ if (valid && sbgen != dgen)
for (bindex = dbstart(dentry);
bindex <= dbend(dentry);
bindex++)
printk(KERN_DEBUG "unionfs: dentry without private data: %.*s\n",
dentry->d_name.len, dentry->d_name.name);
goto out;
- } else if (unlikely(dbstart(dentry) < 0)) {
+ } else if (dbstart(dentry) < 0) {
/* this is due to a failed lookup */
printk(KERN_DEBUG "unionfs: dentry without lower "
"dentries: %.*s\n",
dput(unionfs_lower_dentry_idx(dentry, bindex));
unionfs_set_lower_dentry_idx(dentry, bindex, NULL);
/* NULL lower mnt is ok if this is a negative dentry */
- if (unlikely(!dentry->d_inode &&
- !unionfs_lower_mnt_idx(dentry,bindex)))
+ if (!dentry->d_inode && !unionfs_lower_mnt_idx(dentry,bindex))
continue;
unionfs_mntput(dentry, bindex);
unionfs_set_lower_mnt_idx(dentry, bindex, NULL);
off_t pos = rdstate2offset(buf->rdstate);
u64 unionfs_ino = ino;
- if (likely(!err)) {
+ if (!err) {
err = buf->filldir(buf->dirent, name, namelen, pos,
unionfs_ino, d_type);
buf->rdstate->offset++;
* If we did fill it, stuff it in our hash, otherwise return an
* error.
*/
- if (unlikely(err)) {
+ if (err) {
buf->filldir_error = err;
goto out;
}
while (uds->bindex <= bend) {
lower_file = unionfs_lower_file_idx(file, uds->bindex);
- if (unlikely(!lower_file)) {
+ if (!lower_file) {
uds->bindex++;
uds->dirpos = 0;
continue;
/* Read starting from where we last left off. */
offset = vfs_llseek(lower_file, uds->dirpos, SEEK_SET);
- if (unlikely(offset < 0)) {
+ if (offset < 0) {
err = offset;
goto out;
}
/* Save the position for when we continue. */
offset = vfs_llseek(lower_file, 0, SEEK_CUR);
- if (unlikely(offset < 0)) {
+ if (offset < 0) {
err = offset;
goto out;
}
/* Copy the atime. */
fsstack_copy_attr_atime(inode, lower_file->f_path.dentry->d_inode);
- if (unlikely(err < 0))
+ if (err < 0)
goto out;
- if (unlikely(buf.filldir_error))
+ if (buf.filldir_error)
break;
if (!buf.entries_written) {
} else {
rdstate = find_rdstate(file->f_path.dentry->d_inode,
offset);
- if (likely(rdstate)) {
+ if (rdstate) {
UNIONFS_F(file)->rdstate = rdstate;
err = rdstate->offset;
} else
lookup_one_len(name, lower_dir_dentry,
cursor->namelen +
UNIONFS_WHLEN);
- if (unlikely(IS_ERR(lower_dentry))) {
+ if (IS_ERR(lower_dentry)) {
err = PTR_ERR(lower_dentry);
break;
}
- if (likely(lower_dentry->d_inode))
+ if (lower_dentry->d_inode)
err = vfs_unlink(lower_dir, lower_dentry);
dput(lower_dentry);
- if (unlikely(err))
+ if (err)
break;
}
}
BUG_ON(bindex < dbstart(dentry));
BUG_ON(bindex > dbend(dentry));
err = is_robranch_super(sb, bindex);
- if (unlikely(err))
+ if (err)
goto out;
lower_dir_dentry = unionfs_lower_dentry_idx(dentry, bindex);
found = find_filldir_node(buf->rdstate, name, namelen);
/* If it was found in the table there was a previous whiteout. */
- if (likely(found))
+ if (found)
goto out;
/*
* empty.
*/
err = -ENOTEMPTY;
- if (unlikely((buf->mode == RD_CHECK_EMPTY) && !whiteout))
+ if ((buf->mode == RD_CHECK_EMPTY) && !whiteout)
goto out;
err = add_filldir_node(buf->rdstate, name, namelen,
BUG_ON(!S_ISDIR(dentry->d_inode->i_mode));
- if (unlikely((err = unionfs_partial_lookup(dentry))))
+ if ((err = unionfs_partial_lookup(dentry)))
goto out;
bstart = dbstart(dentry);
dentry_open(lower_dentry,
unionfs_lower_mnt_idx(dentry, bindex),
O_RDONLY);
- if (unlikely(IS_ERR(lower_file))) {
+ if (IS_ERR(lower_file)) {
err = PTR_ERR(lower_file);
dput(lower_dentry);
branchput(sb, bindex);
buf->rdstate->bindex = bindex;
err = vfs_readdir(lower_file,
readdir_util_callback, buf);
- if (unlikely(buf->err))
+ if (buf->err)
err = buf->err;
} while ((err >= 0) && buf->filldir_called);
fput(lower_file);
branchput(sb, bindex);
- if (unlikely(err < 0))
+ if (err < 0)
goto out;
}
out:
- if (likely(buf)) {
+ if (buf) {
if (namelist && !err)
*namelist = buf->rdstate;
- else if (likely(buf->rdstate))
+ else if (buf->rdstate)
free_rdstate(buf->rdstate);
kfree(buf);
}
int bindex;
struct inode *lower;
- if (unlikely(!upper || ibstart(upper) < 0))
+ if (!upper || ibstart(upper) < 0)
return;
for (bindex=ibstart(upper); bindex <= ibend(upper); bindex++) {
lower = unionfs_lower_inode_idx(upper, bindex);
- if (unlikely(!lower))
+ if (!lower)
continue; /* not all lower dir objects may exist */
- if (unlikely(timespec_compare(&upper->i_mtime,
- &lower->i_mtime) < 0))
+ if (unlikely(timespec_compare(&upper->i_mtime, &lower->i_mtime) < 0))
upper->i_mtime = lower->i_mtime;
- if (likely(timespec_compare(&upper->i_ctime,
- &lower->i_ctime) < 0))
+ if (unlikely(timespec_compare(&upper->i_ctime, &lower->i_ctime) < 0))
upper->i_ctime = lower->i_ctime;
- if (likely(timespec_compare(&upper->i_atime,
- &lower->i_atime) < 0))
+ if (unlikely(timespec_compare(&upper->i_atime, &lower->i_atime) < 0))
upper->i_atime = lower->i_atime;
}
}
err = do_sync_read(file, buf, count, ppos);
- if (likely(err >= 0))
+ if (err >= 0)
touch_atime(unionfs_lower_mnt(file->f_path.dentry),
unionfs_lower_dentry(file->f_path.dentry));
err = generic_file_aio_read(iocb, iov, nr_segs, pos);
- if (unlikely(err == -EIOCBQUEUED))
+ if (err == -EIOCBQUEUED)
err = wait_on_sync_kiocb(iocb);
- if (likely(err >= 0))
+ if (err >= 0)
touch_atime(unionfs_lower_mnt(file->f_path.dentry),
unionfs_lower_dentry(file->f_path.dentry));
err = do_sync_write(file, buf, count, ppos);
/* update our inode times upon a successful lower write */
- if (likely(err >= 0)) {
+ if (err >= 0) {
unionfs_copy_attr_times(file->f_path.dentry->d_inode);
unionfs_check_file(file);
}
* generic_file_readonly_mmap returns in that case).
*/
lower_file = unionfs_lower_file(file);
- if (unlikely(willwrite && !lower_file->f_mapping->a_ops->writepage)) {
+ if (willwrite && !lower_file->f_mapping->a_ops->writepage) {
err = -EINVAL;
printk("unionfs: branch %d file system does not support "
"writeable mmap\n", fbstart(file));
} else {
err = generic_file_mmap(file, vma);
- if (unlikely(err))
+ if (err)
printk("unionfs: generic_file_mmap failed %d\n", err);
}
out:
unionfs_read_unlock(file->f_path.dentry->d_sb);
- if (likely(!err)) {
+ if (!err) {
/* copyup could cause parent dir times to change */
unionfs_copy_attr_times(file->f_path.dentry->d_parent->d_inode);
unionfs_check_file(file);
}
for (bindex = bstart; bindex <= bend; bindex++) {
lower_inode = unionfs_lower_inode_idx(inode, bindex);
- if (unlikely(!lower_inode || !lower_inode->i_fop->fsync))
+ if (!lower_inode || !lower_inode->i_fop->fsync)
continue;
lower_file = unionfs_lower_file_idx(file, bindex);
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
lower_dentry,
datasync);
mutex_unlock(&lower_inode->i_mutex);
- if (unlikely(err))
+ if (err)
goto out;
}
}
for (bindex = bstart; bindex <= bend; bindex++) {
lower_inode = unionfs_lower_inode_idx(inode, bindex);
- if (unlikely(!lower_inode || !lower_inode->i_fop->fasync))
+ if (!lower_inode || !lower_inode->i_fop->fasync)
continue;
lower_file = unionfs_lower_file_idx(file, bindex);
mutex_lock(&lower_inode->i_mutex);
err = lower_inode->i_fop->fasync(fd, lower_file, flag);
mutex_unlock(&lower_inode->i_mutex);
- if (unlikely(err))
+ if (err)
goto out;
}
* We _always_ create on branch 0
*/
lower_dentry = unionfs_lower_dentry_idx(dentry, 0);
- if (likely(lower_dentry)) {
+ if (lower_dentry) {
/*
* check if whiteout exists in this branch, i.e. lookup .wh.foo
* first.
wh_dentry = lookup_one_len(name, lower_dentry->d_parent,
dentry->d_name.len + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(wh_dentry))) {
+ if (IS_ERR(wh_dentry)) {
err = PTR_ERR(wh_dentry);
wh_dentry = NULL;
goto out;
}
- if (unlikely(wh_dentry->d_inode)) {
+ if (wh_dentry->d_inode) {
/*
* .wh.foo has been found, so let's unlink it
*/
err = vfs_unlink(lower_dir_dentry->d_inode, wh_dentry);
unlock_dir(lower_dir_dentry);
- if (unlikely(err)) {
+ if (err) {
printk("unionfs_create: could not unlink "
"whiteout, err = %d\n", err);
goto out;
*/
lower_dentry = create_parents(parent, dentry,
dentry->d_name.name, 0);
- if (unlikely(IS_ERR(lower_dentry))) {
+ if (IS_ERR(lower_dentry)) {
err = PTR_ERR(lower_dentry);
goto out;
}
}
lower_parent_dentry = lock_parent(lower_dentry);
- if (unlikely(IS_ERR(lower_parent_dentry))) {
+ if (IS_ERR(lower_parent_dentry)) {
err = PTR_ERR(lower_parent_dentry);
goto out;
}
err = vfs_create(lower_parent_dentry->d_inode, lower_dentry, mode, nd);
- if (likely(!err)) {
+ if (!err) {
err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
- if (likely(!err)) {
+ if (!err) {
unionfs_copy_attr_times(parent);
fsstack_copy_inode_size(parent,
lower_parent_dentry->d_inode);
dput(wh_dentry);
kfree(name);
- if (likely(!err))
+ if (!err)
unionfs_postcopyup_setmnt(dentry);
unionfs_unlock_dentry(dentry);
unionfs_read_unlock(dentry->d_sb);
unionfs_check_inode(parent);
- if (likely(!err))
+ if (!err)
unionfs_check_dentry(dentry->d_parent);
unionfs_check_dentry(dentry);
return err;
nd->dentry = path_save.dentry;
nd->mnt = path_save.mnt;
}
- if (likely(!IS_ERR(ret))) {
+ if (!IS_ERR(ret)) {
if (ret)
dentry = ret;
/* parent times may have changed */
whiteout_dentry = lookup_one_len(name, lower_new_dentry->d_parent,
new_dentry->d_name.len +
UNIONFS_WHLEN);
- if (unlikely(IS_ERR(whiteout_dentry))) {
+ if (IS_ERR(whiteout_dentry)) {
err = PTR_ERR(whiteout_dentry);
goto out;
}
/* found a .wh.foo entry, unlink it and then call vfs_link() */
lower_dir_dentry = lock_parent(whiteout_dentry);
err = is_robranch_super(new_dentry->d_sb, dbstart(new_dentry));
- if (likely(!err))
+ if (!err)
err = vfs_unlink(lower_dir_dentry->d_inode,
whiteout_dentry);
unlock_dir(lower_dir_dentry);
lower_dir_dentry = NULL;
dput(whiteout_dentry);
- if (unlikely(err))
+ if (err)
goto out;
}
new_dentry->d_name.name,
dbstart(old_dentry));
err = PTR_ERR(lower_new_dentry);
- if (unlikely(IS_COPYUP_ERR(err)))
+ if (IS_COPYUP_ERR(err))
goto docopyup;
- if (likely(!lower_new_dentry || IS_ERR(lower_new_dentry)))
+ if (!lower_new_dentry || IS_ERR(lower_new_dentry))
goto out;
}
lower_new_dentry = unionfs_lower_dentry(new_dentry);
unlock_dir(lower_dir_dentry);
docopyup:
- if (unlikely(IS_COPYUP_ERR(err))) {
+ if (IS_COPYUP_ERR(err)) {
int old_bstart = dbstart(old_dentry);
int bindex;
bindex, old_dentry->d_name.name,
old_dentry->d_name.len, NULL,
old_dentry->d_inode->i_size);
- if (likely(!err)) {
+ if (!err) {
lower_new_dentry =
create_parents(dir, new_dentry,
new_dentry->d_name.name,
}
check_link:
- if (unlikely(err || !lower_new_dentry->d_inode))
+ if (err || !lower_new_dentry->d_inode)
goto out;
/* Its a hard link, so use the same inode */
d_drop(new_dentry);
kfree(name);
- if (likely(!err))
+ if (!err)
unionfs_postcopyup_setmnt(new_dentry);
unionfs_unlock_dentry(new_dentry);
whiteout_dentry =
lookup_one_len(name, lower_dentry->d_parent,
dentry->d_name.len + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(whiteout_dentry))) {
+ if (IS_ERR(whiteout_dentry)) {
err = PTR_ERR(whiteout_dentry);
goto out;
}
unlock_dir(lower_dir_dentry);
- if (unlikely(err)) {
+ if (err) {
/* exit if the error returned was NOT -EROFS */
- if (unlikely(!IS_COPYUP_ERR(err)))
+ if (!IS_COPYUP_ERR(err))
goto out;
/*
* should now try to create symlink in the another
lower_dentry = create_parents(dir, dentry,
dentry->d_name.name,
bindex);
- if (unlikely(!lower_dentry || IS_ERR(lower_dentry))) {
- if (unlikely(IS_ERR(lower_dentry)))
+ if (!lower_dentry || IS_ERR(lower_dentry)) {
+ if (IS_ERR(lower_dentry))
err = PTR_ERR(lower_dentry);
printk(KERN_DEBUG "unionfs: lower dentry "
}
unlock_dir(lower_dir_dentry);
- if (unlikely(err || !lower_dentry->d_inode)) {
+ if (err || !lower_dentry->d_inode) {
/*
* break out of for loop if error returned was NOT
* -EROFS.
*/
- if (unlikely(!IS_COPYUP_ERR(err)))
+ if (!IS_COPYUP_ERR(err))
break;
} else {
/*
*/
err = PTR_ERR(unionfs_interpose(dentry,
dir->i_sb, 0));
- if (likely(!err)) {
+ if (!err) {
fsstack_copy_attr_times(dir,
lower_dir_dentry->
d_inode);
d_drop(dentry);
kfree(name);
- if (likely(!err))
+ if (!err)
unionfs_postcopyup_setmnt(dentry);
unionfs_unlock_dentry(dentry);
whiteout_dentry = lookup_one_len(name, lower_dentry->d_parent,
dentry->d_name.len + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(whiteout_dentry))) {
+ if (IS_ERR(whiteout_dentry)) {
err = PTR_ERR(whiteout_dentry);
goto out;
}
unlock_dir(lower_parent_dentry);
- if (unlikely(err)) {
+ if (err) {
/* exit if the error returned was NOT -EROFS */
- if (unlikely(!IS_COPYUP_ERR(err)))
+ if (!IS_COPYUP_ERR(err))
goto out;
bstart--;
} else
lower_dentry = create_parents(parent, dentry,
dentry->d_name.name,
bindex);
- if (unlikely(!lower_dentry || IS_ERR(lower_dentry))) {
+ if (!lower_dentry || IS_ERR(lower_dentry)) {
printk(KERN_DEBUG "unionfs: lower dentry "
" NULL for bindex = %d\n", bindex);
continue;
lower_parent_dentry = lock_parent(lower_dentry);
- if (unlikely(IS_ERR(lower_parent_dentry))) {
+ if (IS_ERR(lower_parent_dentry)) {
err = PTR_ERR(lower_parent_dentry);
goto out;
}
unlock_dir(lower_parent_dentry);
/* did the mkdir succeed? */
- if (unlikely(err))
+ if (err)
break;
for (i = bindex + 1; i < bend; i++) {
* err.
*/
err = PTR_ERR(unionfs_interpose(dentry, parent->i_sb, 0));
- if (likely(!err)) {
+ if (!err) {
unionfs_copy_attr_times(parent);
fsstack_copy_inode_size(parent,
lower_parent_dentry->d_inode);
}
err = make_dir_opaque(dentry, dbstart(dentry));
- if (unlikely(err)) {
+ if (err) {
printk(KERN_ERR "unionfs: mkdir: error creating "
".wh.__dir_opaque: %d\n", err);
goto out;
kfree(name);
- if (likely(!err))
+ if (!err)
unionfs_copy_attr_times(dentry->d_inode);
unionfs_unlock_dentry(dentry);
unionfs_check_inode(parent);
whiteout_dentry = lookup_one_len(name, lower_dentry->d_parent,
dentry->d_name.len + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(whiteout_dentry))) {
+ if (IS_ERR(whiteout_dentry)) {
err = PTR_ERR(whiteout_dentry);
goto out;
}
unlock_dir(lower_parent_dentry);
- if (unlikely(err)) {
- if (unlikely(!IS_COPYUP_ERR(err)))
+ if (err) {
+ if (!IS_COPYUP_ERR(err))
goto out;
bstart--;
} else
lower_dentry = create_parents(dir, dentry,
dentry->d_name.name,
bindex);
- if (unlikely(IS_ERR(lower_dentry))) {
+ if (IS_ERR(lower_dentry)) {
printk(KERN_DEBUG "unionfs: failed to create "
"parents on %d, err = %ld\n",
bindex, PTR_ERR(lower_dentry));
}
lower_parent_dentry = lock_parent(lower_dentry);
- if (unlikely(IS_ERR(lower_parent_dentry))) {
+ if (IS_ERR(lower_parent_dentry)) {
err = PTR_ERR(lower_parent_dentry);
goto out;
}
err = vfs_mknod(lower_parent_dentry->d_inode,
lower_dentry, mode, dev);
- if (unlikely(err)) {
+ if (err) {
unlock_dir(lower_parent_dentry);
break;
}
* err.
*/
err = PTR_ERR(unionfs_interpose(dentry, dir->i_sb, 0));
- if (likely(!err)) {
+ if (!err) {
fsstack_copy_attr_times(dir,
lower_parent_dentry->d_inode);
fsstack_copy_inode_size(dir,
kfree(name);
- if (likely(!err))
+ if (!err)
unionfs_postcopyup_setmnt(dentry);
unionfs_unlock_dentry(dentry);
lower_dentry = unionfs_lower_dentry(dentry);
- if (unlikely(!lower_dentry->d_inode->i_op ||
- !lower_dentry->d_inode->i_op->readlink)) {
+ if (!lower_dentry->d_inode->i_op ||
+ !lower_dentry->d_inode->i_op->readlink) {
err = -EINVAL;
goto out;
}
err = lower_dentry->d_inode->i_op->readlink(lower_dentry,
buf, bufsiz);
- if (likely(err > 0))
+ if (err > 0)
fsstack_copy_attr_atime(dentry->d_inode,
lower_dentry->d_inode);
set_fs(KERNEL_DS);
err = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
set_fs(old_fs);
- if (unlikely(err < 0)) {
+ if (err < 0) {
kfree(buf);
buf = NULL;
goto out;
/*
* Nobody gets write access to an immutable file.
*/
- if (unlikely(IS_IMMUTABLE(inode)))
+ if (IS_IMMUTABLE(inode))
return -EACCES;
/*
* For all other branches than the first one, we ignore
for (bindex = bstart; bindex <= bend; bindex++) {
lower_inode = unionfs_lower_inode_idx(inode, bindex);
- if (unlikely(!lower_inode))
+ if (!lower_inode)
continue;
/*
* we don't have to check for files, if we are checking for
* directories.
*/
- if (unlikely(!is_file && !S_ISDIR(lower_inode->i_mode)))
+ if (!is_file && !S_ISDIR(lower_inode->i_mode))
continue;
/*
* The permissions are an intersection of the overall directory
* permissions, so we fail if one fails.
*/
- if (unlikely(err))
+ if (err)
goto out;
/* only the leftmost file matters. */
if (is_file || write_mask) {
if (is_file && write_mask) {
err = get_write_access(lower_inode);
- if (unlikely(!err))
+ if (!err)
put_write_access(lower_inode);
}
break;
for (bindex = bstart; (bindex <= bend) || (bindex == bstart);
bindex++) {
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- if (unlikely(!lower_dentry))
+ if (!lower_dentry)
continue;
BUG_ON(lower_dentry->d_inode == NULL);
dentry->d_name.len,
NULL, size);
- if (unlikely(!err)) {
+ if (!err) {
copyup = 1;
lower_dentry =
unionfs_lower_dentry(dentry);
}
err = notify_change(lower_dentry, ia);
- if (unlikely(err))
+ if (err)
goto out;
break;
}
if (ia->ia_valid & ATTR_SIZE) {
if (ia->ia_size != i_size_read(inode)) {
err = vmtruncate(inode, ia->ia_size);
- if (unlikely(err))
+ if (err)
printk("unionfs_setattr: vmtruncate failed\n");
}
}
mutex_unlock(&lower_inode->i_mutex);
- if (unlikely(IS_ERR(wh_lower_dentry))) {
+ if (IS_ERR(wh_lower_dentry)) {
err = PTR_ERR(wh_lower_dentry);
goto out;
}
namelen = dentry->d_name.len;
/* No dentries should get created for possible whiteout names. */
- if (unlikely(!is_validname(name))) {
+ if (!is_validname(name)) {
err = -EPERM;
goto out_free;
}
unionfs_lower_dentry_idx(parent_dentry, bindex);
/* if the parent lower dentry does not exist skip this */
- if (unlikely(!(lower_dir_dentry && lower_dir_dentry->d_inode)))
+ if (!(lower_dir_dentry && lower_dir_dentry->d_inode))
continue;
/* also skip it if the parent isn't a directory. */
/* check if whiteout exists in this branch: lookup .wh.foo */
wh_lower_dentry = lookup_one_len(whname, lower_dir_dentry,
namelen + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(wh_lower_dentry))) {
+ if (IS_ERR(wh_lower_dentry)) {
dput(first_lower_dentry);
unionfs_mntput(first_dentry, first_dentry_offset);
err = PTR_ERR(wh_lower_dentry);
if (wh_lower_dentry->d_inode) {
/* We found a whiteout so lets give up. */
- if (likely(S_ISREG(wh_lower_dentry->d_inode->i_mode))) {
+ if (S_ISREG(wh_lower_dentry->d_inode->i_mode)) {
set_dbend(dentry, bindex);
set_dbopaque(dentry, bindex);
dput(wh_lower_dentry);
lower_dentry = lookup_one_len_nd(name, lower_dir_dentry,
namelen, nd);
- if (unlikely(IS_ERR(lower_dentry))) {
+ if (IS_ERR(lower_dentry)) {
dput(first_lower_dentry);
unionfs_mntput(first_dentry, first_dentry_offset);
err = PTR_ERR(lower_dentry);
lookup_one_len_nd(name, lower_dir_dentry,
namelen, nd);
first_dentry_offset = bindex;
- if (unlikely(IS_ERR(first_lower_dentry))) {
+ if (IS_ERR(first_lower_dentry)) {
err = PTR_ERR(first_lower_dentry);
goto out;
}
* dentry.
*/
d_interposed = unionfs_interpose(dentry, dentry->d_sb, lookupmode);
- if (unlikely(IS_ERR(d_interposed)))
+ if (IS_ERR(d_interposed))
err = PTR_ERR(d_interposed);
else if (d_interposed)
dentry = d_interposed;
- if (unlikely(err))
+ if (err)
goto out_drop;
goto out;
err = 0;
goto out;
}
- if (unlikely(IS_ERR(tmp))) {
+ if (IS_ERR(tmp)) {
err = PTR_ERR(tmp);
goto out;
}
void unionfs_destroy_dentry_cache(void)
{
- if (likely(unionfs_dentry_cachep))
+ if (unionfs_dentry_cachep)
kmem_cache_destroy(unionfs_dentry_cachep);
}
void free_dentry_private_data(struct dentry *dentry)
{
- if (unlikely(!dentry || !dentry->d_fsdata))
+ if (!dentry || !dentry->d_fsdata)
return;
kmem_cache_free(unionfs_dentry_cachep, dentry->d_fsdata);
dentry->d_fsdata = NULL;
/* UNIONFS_D(dentry)->lock must be locked */
static int realloc_dentry_private_data(struct dentry *dentry)
{
- if (likely(!__realloc_dentry_private_data(dentry)))
+ if (!__realloc_dentry_private_data(dentry))
return 0;
kfree(UNIONFS_D(dentry)->lower_paths);
dentry->d_fsdata = info;
- if (likely(!__realloc_dentry_private_data(dentry)))
+ if (!__realloc_dentry_private_data(dentry))
return 0;
mutex_unlock(&info->lock);
for (bindex = bstart; bindex <= bend; bindex++) {
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- if (unlikely(!lower_dentry)) {
+ if (!lower_dentry) {
unionfs_set_lower_inode_idx(inode, bindex, NULL);
continue;
}
/* Initialize the lower inode to the new lower inode. */
- if (unlikely(!lower_dentry->d_inode))
+ if (!lower_dentry->d_inode)
continue;
unionfs_set_lower_inode_idx(inode, bindex,
lower_inode = unionfs_lower_inode(inode);
/* Use different set of inode ops for symlinks & directories */
- if (unlikely(S_ISLNK(lower_inode->i_mode)))
+ if (S_ISLNK(lower_inode->i_mode))
inode->i_op = &unionfs_symlink_iops;
else if (S_ISDIR(lower_inode->i_mode))
inode->i_op = &unionfs_dir_iops;
inode->i_fop = &unionfs_dir_fops;
/* properly initialize special inodes */
- if (unlikely(S_ISBLK(lower_inode->i_mode) ||
- S_ISCHR(lower_inode->i_mode) ||
- S_ISFIFO(lower_inode->i_mode) ||
- S_ISSOCK(lower_inode->i_mode)))
+ if (S_ISBLK(lower_inode->i_mode) || S_ISCHR(lower_inode->i_mode) ||
+ S_ISFIFO(lower_inode->i_mode) || S_ISSOCK(lower_inode->i_mode))
init_special_inode(inode, lower_inode->i_mode,
lower_inode->i_rdev);
} else {
/* get unique inode number for unionfs */
inode = iget(sb, iunique(sb, UNIONFS_ROOT_INO));
- if (unlikely(!inode)) {
+ if (!inode) {
err = -EACCES;
goto out;
}
break;
case INTERPOSE_LOOKUP:
spliced = d_splice_alias(inode, dentry);
- if (unlikely(IS_ERR(spliced)))
+ if (IS_ERR(spliced))
err = PTR_ERR(spliced);
else if (spliced && spliced != dentry) {
/*
goto out;
out_spliced:
- if (likely(!err))
+ if (!err)
return spliced;
out:
return ERR_PTR(err);
bend = dbend(dentry);
for (bindex = bstart; bindex <= bend; bindex++) {
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- if (unlikely(!lower_dentry))
+ if (!lower_dentry)
continue;
- if (unlikely(!lower_dentry->d_inode))
+ if (!lower_dentry->d_inode)
continue;
- if (unlikely(unionfs_lower_inode_idx(inode, bindex)))
+ if (unionfs_lower_inode_idx(inode, bindex))
continue;
unionfs_set_lower_inode_idx(inode, bindex,
igrab(lower_dentry->d_inode));
int check_branch(struct nameidata *nd)
{
/* XXX: remove in ODF code -- stacking unions allowed there */
- if (unlikely(!strcmp(nd->dentry->d_sb->s_type->name, "unionfs")))
+ if (!strcmp(nd->dentry->d_sb->s_type->name, "unionfs"))
return -EINVAL;
- if (unlikely(!nd->dentry->d_inode))
+ if (!nd->dentry->d_inode)
return -ENOENT;
- if (unlikely(!S_ISDIR(nd->dentry->d_inode->i_mode)))
+ if (!S_ISDIR(nd->dentry->d_inode->i_mode))
return -ENOTDIR;
return 0;
}
while ((dent != dent2) && (dent->d_parent != dent))
dent = dent->d_parent;
- if (unlikely(dent == dent2))
+ if (dent == dent2)
return 1;
dent = dent2;
*/
int __parse_branch_mode(const char *name)
{
- if (unlikely(!name))
+ if (!name)
return 0;
if (!strcmp(name, "ro"))
return MAY_READ;
struct dentry *dent1;
struct dentry *dent2;
- if (unlikely(options[0] == '\0')) {
+ if (options[0] == '\0') {
printk(KERN_WARNING "unionfs: no branches specified\n");
err = -EINVAL;
goto out;
if (!name)
continue;
- if (unlikely(!*name)) { /* bad use of ':' (extra colons)) */
+ if (!*name) { /* bad use of ':' (extra colons) */
err = -EINVAL;
goto out;
}
*mode++ = '\0';
perms = parse_branch_mode(mode);
- if (unlikely(!bindex && !(perms & MAY_WRITE))) {
+ if (!bindex && !(perms & MAY_WRITE)) {
err = -EINVAL;
goto out;
}
err = path_lookup(name, LOOKUP_FOLLOW, &nd);
- if (unlikely(err)) {
+ if (err) {
printk(KERN_WARNING "unionfs: error accessing "
"lower directory '%s' (error %d)\n",
name, err);
goto out;
}
- if (unlikely((err = check_branch(&nd)))) {
+ if ((err = check_branch(&nd))) {
printk(KERN_WARNING "unionfs: lower directory "
"'%s' is not a valid branch\n", name);
path_release(&nd);
bindex++;
}
- if (unlikely(branches == 0)) {
+ if (branches == 0) {
printk(KERN_WARNING "unionfs: no branches specified\n");
err = -EINVAL;
goto out;
dent1 = lower_root_info->lower_paths[i].dentry;
for (j = i + 1; j < branches; j++) {
dent2 = lower_root_info->lower_paths[j].dentry;
- if (unlikely(is_branch_overlap(dent1, dent2))) {
+ if (is_branch_overlap(dent1, dent2)) {
printk(KERN_WARNING "unionfs: branches %d and "
"%d overlap\n", i, j);
err = -EINVAL;
}
out:
- if (unlikely(err)) {
+ if (err) {
for (i = 0; i < branches; i++)
if (lower_root_info->lower_paths[i].dentry) {
dput(lower_root_info->lower_paths[i].dentry);
char *endptr;
int intval;
- if (unlikely(!optname || !*optname))
+ if (!optname || !*optname)
continue;
optarg = strchr(optname, '=');
* All of our options take an argument now. Insert ones that
* don't, above this check.
*/
- if (unlikely(!optarg)) {
+ if (!optarg) {
printk("unionfs: %s requires an argument.\n", optname);
err = -EINVAL;
goto out_error;
}
if (!strcmp("dirs", optname)) {
- if (unlikely(++dirsfound > 1)) {
+ if (++dirsfound > 1) {
printk(KERN_WARNING
"unionfs: multiple dirs specified\n");
err = -EINVAL;
goto out_error;
}
err = parse_dirs_option(sb, lower_root_info, optarg);
- if (unlikely(err))
+ if (err)
goto out_error;
continue;
}
/* All of these options require an integer argument. */
intval = simple_strtoul(optarg, &endptr, 0);
- if (unlikely(*endptr)) {
+ if (*endptr) {
printk(KERN_WARNING
"unionfs: invalid %s option '%s'\n",
optname, optarg);
"unionfs: unrecognized option '%s'\n", optname);
goto out_error;
}
- if (unlikely(dirsfound != 1)) {
+ if (dirsfound != 1) {
printk(KERN_WARNING "unionfs: dirs option required\n");
err = -EINVAL;
goto out_error;
{
struct dentry *ret = NULL;
- if (likely(sb)) {
+ if (sb) {
static const struct qstr name = {.name = "/",.len = 1 };
ret = d_alloc(NULL, &name);
struct unionfs_dentry_info *lower_root_info = NULL;
int bindex, bstart, bend;
- if (unlikely(!raw_data)) {
+ if (!raw_data) {
printk(KERN_WARNING
"unionfs: read_super: missing data argument\n");
err = -EINVAL;
UNIONFS_SB(sb)->high_branch_id = -1; /* -1 == invalid branch ID */
lower_root_info = unionfs_parse_options(sb, raw_data);
- if (unlikely(IS_ERR(lower_root_info))) {
+ if (IS_ERR(lower_root_info)) {
printk(KERN_WARNING
"unionfs: read_super: error while parsing options "
"(err = %ld)\n", PTR_ERR(lower_root_info));
lower_root_info = NULL;
goto out_free;
}
- if (unlikely(lower_root_info->bstart == -1)) {
+ if (lower_root_info->bstart == -1) {
err = -ENOENT;
goto out_free;
}
*/
err = PTR_ERR(unionfs_interpose(sb->s_root, sb, 0));
unionfs_unlock_dentry(sb->s_root);
- if (likely(!err))
+ if (!err)
goto out;
/* else fall through */
* resort to RAIF's page pointer flipping trick.)
*/
lower_page = find_lock_page(lower_inode->i_mapping, page->index);
- if (unlikely(!lower_page)) {
+ if (!lower_page) {
err = AOP_WRITEPAGE_ACTIVATE;
set_page_dirty(page);
goto out;
BUG_ON(!lower_inode->i_mapping->a_ops->writepage);
/* workaround for some lower file systems: see big comment on top */
- if (unlikely(wbc->for_writepages /* && !wbc->fs_private */))
+ if (wbc->for_writepages /* && !wbc->fs_private */)
wbc->for_writepages = 0;
/* call lower writepage (expects locked page) */
wbc->for_writepages = saved_for_writepages; /* restore value */
/* b/c find_lock_page locked it and ->writepage unlocks on success */
- if (unlikely(err))
+ if (err)
unlock_page(lower_page);
/* b/c grab_cache_page increased refcnt */
page_cache_release(lower_page);
- if (unlikely(err < 0)) {
+ if (err < 0) {
ClearPageUptodate(page);
goto out;
}
char *page_data = NULL;
loff_t offset;
- if (unlikely(!UNIONFS_F(file))) {
+ if (!UNIONFS_F(file)) {
err = -ENOENT;
goto out;
}
kunmap(page);
- if (unlikely(err < 0))
+ if (err < 0)
goto out;
err = 0;
flush_dcache_page(page);
out:
- if (likely(err == 0))
+ if (err == 0)
SetPageUptodate(page);
else
ClearPageUptodate(page);
err = unionfs_do_readpage(file, page);
- if (likely(!err)) {
+ if (!err) {
touch_atime(unionfs_lower_mnt(file->f_path.dentry),
unionfs_lower_dentry(file->f_path.dentry));
unionfs_copy_attr_times(file->f_path.dentry->d_inode);
inode = page->mapping->host;
lower_inode = unionfs_lower_inode(inode);
- if (likely(UNIONFS_F(file) != NULL))
+ if (UNIONFS_F(file) != NULL)
lower_file = unionfs_lower_file(file);
/* FIXME: is this assertion right here? */
kunmap(page);
- if (unlikely(err < 0))
+ if (err < 0)
goto out;
inode->i_blocks = lower_inode->i_blocks;
mark_inode_dirty_sync(inode);
out:
- if (unlikely(err < 0))
+ if (err < 0)
ClearPageUptodate(page);
unionfs_read_unlock(file->f_path.dentry->d_sb);
* do is ensure that pending I/O gets done.
*/
lower_page = find_lock_page(lower_inode->i_mapping, page->index);
- if (unlikely(!lower_page)) {
+ if (!lower_page) {
printk(KERN_DEBUG "unionfs: find_lock_page failed\n");
goto out;
}
void unionfs_destroy_filldir_cache(void)
{
- if (likely(unionfs_filldir_cachep))
+ if (unionfs_filldir_cachep)
kmem_cache_destroy(unionfs_filldir_cachep);
}
return UNIONFS_I(inode)->hashsize;
for (bindex = ibstart(inode); bindex <= ibend(inode); bindex++) {
- lower_inode = unionfs_lower_inode_idx(inode, bindex);
- if (unlikely(!lower_inode))
+ if (!(lower_inode = unionfs_lower_inode_idx(inode, bindex)))
continue;
if (lower_inode->i_size == DENTPAGE)
}
}
- if (unlikely(!found))
+ if (!found)
cursor = NULL;
return cursor;
create_parents(new_dentry->d_parent->d_inode,
new_dentry, new_dentry->d_name.name,
bindex);
- if (unlikely(IS_ERR(lower_new_dentry))) {
+ if (IS_ERR(lower_new_dentry)) {
printk(KERN_DEBUG "unionfs: error creating directory "
"tree for rename, bindex = %d, err = %ld\n",
bindex, PTR_ERR(lower_new_dentry));
lower_wh_dentry = lookup_one_len(wh_name, lower_new_dentry->d_parent,
new_dentry->d_name.len +
UNIONFS_WHLEN);
- if (unlikely(IS_ERR(lower_wh_dentry))) {
+ if (IS_ERR(lower_wh_dentry)) {
err = PTR_ERR(lower_wh_dentry);
goto out;
}
if (lower_wh_dentry->d_inode) {
/* get rid of the whiteout that is existing */
- if (unlikely(lower_new_dentry->d_inode)) {
+ if (lower_new_dentry->d_inode) {
printk(KERN_WARNING "unionfs: both a whiteout and a "
"dentry exist when doing a rename!\n");
err = -EIO;
dput(lower_wh_dentry);
unlock_dir(lower_wh_dir_dentry);
- if (unlikely(err))
+ if (err)
goto out;
} else
dput(lower_wh_dentry);
lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
err = is_robranch_super(old_dentry->d_sb, bindex);
- if (unlikely(err))
+ if (err)
goto out_unlock;
/*
UNIONFS_WHLEN);
kfree(whname);
err = PTR_ERR(*wh_old);
- if (unlikely(IS_ERR(*wh_old))) {
+ if (IS_ERR(*wh_old)) {
*wh_old = NULL;
goto out_unlock;
}
dput(lower_old_dentry);
out:
- if (likely(!err)) {
+ if (!err) {
/* Fixup the new_dentry. */
if (bindex < dbstart(new_dentry))
set_dbstart(new_dentry, bindex);
/* Rename source to destination. */
err = __unionfs_rename(old_dir, old_dentry, new_dir, new_dentry,
old_bstart, &wh_old);
- if (unlikely(err)) {
- if (unlikely(!IS_COPYUP_ERR(err)))
+ if (err) {
+ if (!IS_COPYUP_ERR(err))
goto out;
do_copyup = old_bstart - 1;
} else
struct dentry *unlink_dir_dentry;
unlink_dentry = unionfs_lower_dentry_idx(new_dentry, bindex);
- if (unlikely(!unlink_dentry))
+ if (!unlink_dentry)
continue;
unlink_dir_dentry = lock_parent(unlink_dentry);
unionfs_get_nlinks(new_dentry->d_parent->d_inode);
unlock_dir(unlink_dir_dentry);
- if (likely(!err)) {
+ if (!err) {
if (bindex != new_bstart) {
dput(unlink_dentry);
unionfs_set_lower_dentry_idx(new_dentry,
bindex, NULL);
}
- } else if (unlikely(IS_COPYUP_ERR(err))) {
+ } else if (IS_COPYUP_ERR(err)) {
do_copyup = bindex - 1;
- } else if (unlikely(revert)) {
+ } else if (revert) {
dput(wh_old);
goto revert;
}
old_dentry->d_name.len,
NULL, old_dentry->d_inode->i_size);
/* if copyup failed, try next branch to the left */
- if (unlikely(err))
+ if (err)
continue;
dput(wh_old);
bwh_old = bindex;
/* make it opaque */
if (S_ISDIR(old_dentry->d_inode->i_mode)) {
err = make_dir_opaque(old_dentry, dbstart(old_dentry));
- if (unlikely(err))
+ if (err)
goto revert;
}
* (1) There is more than one underlying instance of source.
* (2) We did a copy_up
*/
- if (unlikely((old_bstart != old_bend) || (do_copyup != -1))) {
+ if ((old_bstart != old_bend) || (do_copyup != -1)) {
struct dentry *lower_parent;
- if (unlikely(!wh_old || wh_old->d_inode || bwh_old < 0)) {
+ if (!wh_old || wh_old->d_inode || bwh_old < 0) {
printk(KERN_ERR "unionfs: rename error "
"(wh_old=%p/%p bwh_old=%d)\n", wh_old,
(wh_old ? wh_old->d_inode : NULL), bwh_old);
local_err = vfs_create(lower_parent->d_inode, wh_old, S_IRUGO,
NULL);
unlock_dir(lower_parent);
- if (likely(!local_err))
+ if (!local_err)
set_dbopaque(old_dentry, bwh_old);
else {
/*
revert:
/* Do revert here. */
local_err = unionfs_refresh_lower_dentry(new_dentry, old_bstart);
- if (unlikely(local_err)) {
+ if (local_err) {
printk(KERN_WARNING "unionfs: revert failed in rename: "
"the new refresh failed.\n");
eio = -EIO;
}
local_err = unionfs_refresh_lower_dentry(old_dentry, old_bstart);
- if (unlikely(local_err)) {
+ if (local_err) {
printk(KERN_WARNING "unionfs: revert failed in rename: "
"the old refresh failed.\n");
eio = -EIO;
goto revert_out;
}
- if (unlikely(!unionfs_lower_dentry_idx(new_dentry, bindex) ||
- !unionfs_lower_dentry_idx(new_dentry, bindex)->d_inode)) {
+ if (!unionfs_lower_dentry_idx(new_dentry, bindex) ||
+ !unionfs_lower_dentry_idx(new_dentry, bindex)->d_inode) {
printk(KERN_WARNING "unionfs: revert failed in rename: "
"the object disappeared from under us!\n");
eio = -EIO;
goto revert_out;
}
- if (unlikely(unionfs_lower_dentry_idx(old_dentry, bindex) &&
- unionfs_lower_dentry_idx(old_dentry, bindex)->d_inode)) {
+ if (unionfs_lower_dentry_idx(old_dentry, bindex) &&
+ unionfs_lower_dentry_idx(old_dentry, bindex)->d_inode) {
printk(KERN_WARNING "unionfs: revert failed in rename: "
"the object was created underneath us!\n");
eio = -EIO;
old_dir, old_dentry, old_bstart, NULL);
/* If we can't fix it, then we cop-out with -EIO. */
- if (unlikely(local_err)) {
+ if (local_err) {
printk(KERN_WARNING "unionfs: revert failed in rename!\n");
eio = -EIO;
}
local_err = unionfs_refresh_lower_dentry(new_dentry, bindex);
- if (unlikely(local_err))
+ if (local_err)
eio = -EIO;
local_err = unionfs_refresh_lower_dentry(old_dentry, bindex);
- if (unlikely(local_err))
+ if (local_err)
eio = -EIO;
revert_out:
wh_dentry = ERR_PTR(-ENOENT);
for (bindex = bstart; bindex <= bend; bindex++) {
lower_parent = unionfs_lower_dentry_idx(parent, bindex);
- if (unlikely(!lower_parent))
+ if (!lower_parent)
continue;
wh_dentry = lookup_one_len(whname, lower_parent,
dentry->d_name.len + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(wh_dentry)))
+ if (IS_ERR(wh_dentry))
continue;
if (wh_dentry->d_inode)
break;
int err, bstart;
err = check_empty(dentry, NULL);
- if (unlikely(err == -ENOTEMPTY)) {
- if (unlikely(is_robranch(dentry)))
+ if (err == -ENOTEMPTY) {
+ if (is_robranch(dentry))
return -EXDEV;
- } else if (likely(err))
+ } else if (err)
return err;
bstart = dbstart(dentry);
set_dbstart(dentry, bstart + 1);
err = check_empty(dentry, NULL);
set_dbstart(dentry, bstart);
- if (unlikely(err == -ENOTEMPTY))
+ if (err == -ENOTEMPTY)
err = -EXDEV;
return err;
}
else
err = may_rename_dir(old_dentry);
- if (unlikely(err))
+ if (err)
goto out;
err = unionfs_partial_lookup(new_dentry);
- if (unlikely(err))
+ if (err)
goto out;
/*
* simply override it even if the whited-out dir is not empty.
*/
wh_dentry = lookup_whiteout(new_dentry);
- if (likely(!IS_ERR(wh_dentry)))
+ if (!IS_ERR(wh_dentry))
dput(wh_dentry);
else if (new_dentry->d_inode) {
- if (unlikely(S_ISDIR(old_dentry->d_inode->i_mode) !=
- S_ISDIR(new_dentry->d_inode->i_mode))) {
+ if (S_ISDIR(old_dentry->d_inode->i_mode) !=
+ S_ISDIR(new_dentry->d_inode->i_mode)) {
err = S_ISDIR(old_dentry->d_inode->i_mode) ?
-ENOTDIR : -EISDIR;
goto out;
struct unionfs_dir_state *namelist;
/* check if this unionfs directory is empty or not */
err = check_empty(new_dentry, &namelist);
- if (unlikely(err))
+ if (err)
goto out;
if (!is_robranch(new_dentry))
free_rdstate(namelist);
- if (unlikely(err))
+ if (err)
goto out;
}
}
err = do_unionfs_rename(old_dir, old_dentry, new_dir, new_dentry);
out:
- if (unlikely(err))
+ if (err)
/* clear the new_dentry stuff created */
d_drop(new_dentry);
else {
int err;
superio_workqueue = create_workqueue("unionfs_siod");
- if (unlikely(!IS_ERR(superio_workqueue)))
+ if (!IS_ERR(superio_workqueue))
return 0;
err = PTR_ERR(superio_workqueue);
void stop_sioq(void)
{
- if (likely(superio_workqueue))
+ if (superio_workqueue)
destroy_workqueue(superio_workqueue);
}
dentry,
dentry->d_name.name,
bindex);
- if (unlikely(!lower_dentry || IS_ERR(lower_dentry))) {
+ if (!lower_dentry || IS_ERR(lower_dentry)) {
printk(KERN_DEBUG "unionfs: create_parents "
"failed for bindex = %d\n", bindex);
continue;
lower_wh_dentry =
lookup_one_len(name, lower_dentry->d_parent,
dentry->d_name.len + UNIONFS_WHLEN);
- if (unlikely(IS_ERR(lower_wh_dentry)))
+ if (IS_ERR(lower_wh_dentry))
continue;
/*
unlock_dir(lower_dir_dentry);
dput(lower_wh_dentry);
- if (unlikely(!err || !IS_COPYUP_ERR(err)))
+ if (!err || !IS_COPYUP_ERR(err))
break;
}
/* set dbopaque so that lookup will not proceed after this branch */
- if (likely(!err))
+ if (!err)
set_dbopaque(dentry, bindex);
out:
lower_dentry = lookup_one_len(dentry->d_name.name, lower_parent,
dentry->d_name.len);
- if (unlikely(IS_ERR(lower_dentry))) {
+ if (IS_ERR(lower_dentry)) {
err = PTR_ERR(lower_dentry);
goto out;
}
iput(unionfs_lower_inode_idx(dentry->d_inode, bindex));
unionfs_set_lower_inode_idx(dentry->d_inode, bindex, NULL);
- if (unlikely(!lower_dentry->d_inode)) {
+ if (!lower_dentry->d_inode) {
dput(lower_dentry);
unionfs_set_lower_dentry_idx(dentry, bindex, NULL);
} else {
mutex_lock(&lower_dir->i_mutex);
diropq = lookup_one_len(UNIONFS_DIR_OPAQUE, lower_dentry,
sizeof(UNIONFS_DIR_OPAQUE) - 1);
- if (unlikely(IS_ERR(diropq))) {
+ if (IS_ERR(diropq)) {
err = PTR_ERR(diropq);
goto out;
}
if (!diropq->d_inode)
err = vfs_create(lower_dir, diropq, S_IRUGO, NULL);
- if (likely(!err))
+ if (!err)
set_dbopaque(dentry, bindex);
dput(diropq);
int unionfs_get_nlinks(const struct inode *inode)
{
/* don't bother to do all the work since we're unlinked */
- if (unlikely(inode->i_nlink == 0))
+ if (inode->i_nlink == 0)
return 0;
if (!S_ISDIR(inode->i_mode))
int leaks = 0;
spd = UNIONFS_SB(sb);
- if (unlikely(!spd))
+ if (!spd)
return;
bstart = sbstart(sb);
struct nameidata nd;
/* by now, optarg contains the branch name */
- if (unlikely(!*optarg)) {
+ if (!*optarg) {
printk("unionfs: no branch specified for mode change.\n");
goto out;
}
- if (unlikely(!modename)) {
+ if (!modename) {
printk("unionfs: branch \"%s\" requires a mode.\n", optarg);
goto out;
}
*modename++ = '\0';
perms = __parse_branch_mode(modename);
- if (unlikely(perms == 0)) {
+ if (perms == 0) {
printk("unionfs: invalid mode \"%s\" for \"%s\".\n",
modename, optarg);
goto out;
* uniqueness.
*/
err = path_lookup(optarg, LOOKUP_FOLLOW, &nd);
- if (unlikely(err)) {
+ if (err) {
printk(KERN_WARNING "unionfs: error accessing "
"lower directory \"%s\" (error %d)\n",
optarg, err);
nd.dentry == new_lower_paths[idx].dentry)
break;
path_release(&nd); /* no longer needed */
- if (unlikely(idx == cur_branches)) {
+ if (idx == cur_branches) {
err = -ENOENT; /* err may have been reset above */
printk(KERN_WARNING "unionfs: branch \"%s\" "
"not found\n", optarg);
* uniqueness.
*/
err = path_lookup(optarg, LOOKUP_FOLLOW, &nd);
- if (unlikely(err)) {
+ if (err) {
printk(KERN_WARNING "unionfs: error accessing "
"lower directory \"%s\" (error %d)\n",
optarg, err);
nd.dentry == new_lower_paths[idx].dentry)
break;
path_release(&nd); /* no longer needed */
- if (unlikely(idx == cur_branches)) {
+ if (idx == cur_branches) {
printk(KERN_WARNING "unionfs: branch \"%s\" "
"not found\n", optarg);
err = -ENOENT;
goto out;
}
/* check if there are any open files on the branch to be deleted */
- if (unlikely(atomic_read(&new_data[idx].open_files) > 0)) {
+ if (atomic_read(&new_data[idx].open_files) > 0) {
err = -EBUSY;
goto out;
}
* uniqueness.
*/
err = path_lookup(optarg, LOOKUP_FOLLOW, &nd);
- if (unlikely(err)) {
+ if (err) {
printk(KERN_WARNING "unionfs: error accessing "
"lower directory \"%s\" (error %d)\n",
optarg, err);
nd.dentry == new_lower_paths[idx].dentry)
break;
path_release(&nd); /* no longer needed */
- if (unlikely(idx == cur_branches)) {
+ if (idx == cur_branches) {
printk(KERN_WARNING "unionfs: branch \"%s\" "
"not found\n", optarg);
err = -ENOENT;
*modename++ = '\0';
perms = parse_branch_mode(modename);
- if (unlikely(!new_branch || !*new_branch)) {
+ if (!new_branch || !*new_branch) {
printk(KERN_WARNING "unionfs: null new branch\n");
err = -EINVAL;
goto out;
}
err = path_lookup(new_branch, LOOKUP_FOLLOW, &nd);
- if (unlikely(err)) {
+ if (err) {
printk(KERN_WARNING "unionfs: error accessing "
"lower directory \"%s\" (error %d)\n",
new_branch, err);
* because this code base doesn't support stacking unionfs: the ODF
* code base supports that correctly.
*/
- if (unlikely((err = check_branch(&nd)))) {
+ if ((err = check_branch(&nd))) {
printk(KERN_WARNING "unionfs: lower directory "
"\"%s\" is not a valid branch\n", optarg);
path_release(&nd);
* need to check if any other flags may have been passed (none are
* allowed/supported as of now).
*/
- if (unlikely((*flags & ~(MS_RDONLY | MS_SILENT)) != 0)) {
+ if ((*flags & ~(MS_RDONLY | MS_SILENT)) != 0) {
printk(KERN_WARNING
"unionfs: remount flags 0x%x unsupported\n", *flags);
err = -EINVAL;
* the union to a "ro" or "rw" and the VFS took care of it. So
* nothing to do and we're done.
*/
- if (unlikely(!options || options[0] == '\0'))
+ if (!options || options[0] == '\0')
goto out_error;
/*
while ((optname = strsep(&optionstmp, ",")) != NULL) {
char *optarg;
- if (unlikely(!optname || !*optname))
+ if (!optname || !*optname)
continue;
optarg = strchr(optname, '=');
}
kfree(tmp_to_free);
/* after all changes, will we have at least one branch left? */
- if (unlikely((new_branches + add_branches - del_branches) < 1)) {
+ if ((new_branches + add_branches - del_branches) < 1) {
printk(KERN_WARNING
"unionfs: no branches left after remount\n");
err = -EINVAL;
while ((optname = strsep(&options, ",")) != NULL) {
char *optarg;
- if (unlikely(!optname || !*optname))
+ if (!optname || !*optname)
continue;
/*
* At this stage optname holds a comma-delimited option, but
* that don't above this check.) So at this stage optname
* contains the CMD part and optarg contains the ARG part.
*/
- if (unlikely(!optarg || !*optarg)) {
+ if (!optarg || !*optarg) {
printk("unionfs: all remount options require "
"an argument (%s).\n", optname);
err = -EINVAL;
tmp_data,
tmp_lower_paths,
&new_high_branch_id);
- if (unlikely(err))
+ if (err)
goto out_release;
new_branches++;
- if (unlikely(new_branches > UNIONFS_MAX_BRANCHES)) {
+ if (new_branches > UNIONFS_MAX_BRANCHES) {
printk("unionfs: command exceeds "
"%d branches\n", UNIONFS_MAX_BRANCHES);
err = -E2BIG;
err = do_remount_del_option(optarg, new_branches,
tmp_data,
tmp_lower_paths);
- if (unlikely(err))
+ if (err)
goto out_release;
new_branches--;
continue;
err = do_remount_mode_option(optarg, new_branches,
tmp_data,
tmp_lower_paths);
- if (unlikely(err))
+ if (err)
goto out_release;
continue;
}
* actually process the ro/rw remount options, we have to
* return 0 from this function.
*/
- if (unlikely(!strcmp("dirs", optname))) {
+ if (!strcmp("dirs", optname)) {
printk(KERN_WARNING
"unionfs: remount ignoring option \"%s\".\n",
optname);
* have to be re-read.
*******************************************************************/
- if (unlikely(!(tmp_data[0].branchperms & MAY_WRITE))) {
+ if (!(tmp_data[0].branchperms & MAY_WRITE)) {
printk("unionfs: leftmost branch cannot be read-only "
"(use \"remount,ro\" to create a read-only union)\n");
err = -EINVAL;
i = atomic_inc_return(&UNIONFS_SB(sb)->generation);
atomic_set(&UNIONFS_D(sb->s_root)->generation, i);
atomic_set(&UNIONFS_I(sb->s_root->d_inode)->generation, i);
- if (likely(!(*flags & MS_SILENT)))
+ if (!(*flags & MS_SILENT))
printk("unionfs: new generation number %d\n", i);
/* finally, update the root dentry's times */
unionfs_copy_attr_times(sb->s_root->d_inode);
*/
out_release:
/* no need to cleanup/release anything in tmp_data */
- if (likely(tmp_lower_paths))
+ if (tmp_lower_paths)
for (i=0; i<new_branches; i++)
pathput(&tmp_lower_paths[i]);
out_free:
*/
bstart = ibstart(inode);
bend = ibend(inode);
- if (likely(bstart >= 0)) {
+ if (bstart >= 0) {
for (bindex = bstart; bindex <= bend; bindex++) {
lower_inode = unionfs_lower_inode_idx(inode, bindex);
- if (unlikely(!lower_inode))
+ if (!lower_inode)
continue;
iput(lower_inode);
}
/* unionfs inode cache destructor */
void unionfs_destroy_inode_cache(void)
{
- if (likely(unionfs_inode_cachep))
+ if (unionfs_inode_cachep)
kmem_cache_destroy(unionfs_inode_cachep);
}
struct vfsmount *lower_mnt;
int bindex, bstart, bend;
- if (likely(!(flags & MNT_FORCE)))
+ if (!(flags & MNT_FORCE))
/*
* we are not being MNT_FORCE'd, therefore we should emulate
* old behavior
path = d_path(unionfs_lower_dentry_idx(sb->s_root, bindex),
unionfs_lower_mnt_idx(sb->s_root, bindex),
tmp_page, PAGE_SIZE);
- if (unlikely(IS_ERR(path))) {
+ if (IS_ERR(path)) {
ret = PTR_ERR(path);
goto out;
}
mnt = mntget(unionfs_lower_mnt_idx(dentry, bindex));
#ifdef CONFIG_UNION_FS_DEBUG
- if (unlikely(!mnt))
+ if (!mnt)
printk(KERN_DEBUG "unionfs_mntget: mnt=%p bindex=%d\n",
mnt, bindex);
#endif /* CONFIG_UNION_FS_DEBUG */
{
struct vfsmount *mnt;
- if (unlikely(!dentry && bindex < 0))
+ if (!dentry && bindex < 0)
return;
BUG_ON(!dentry || bindex < 0);
int bindex;
int err = 0;
- if (unlikely((err = unionfs_partial_lookup(dentry))))
+ if ((err = unionfs_partial_lookup(dentry)))
goto out;
bindex = dbstart(dentry);
lower_dentry = unionfs_lower_dentry_idx(dentry, bindex);
- if (unlikely(!lower_dentry))
+ if (!lower_dentry)
goto out;
lower_dir_dentry = lock_parent(lower_dentry);
if (!(err = is_robranch_super(dentry->d_sb, bindex)))
err = vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
/* if vfs_unlink succeeded, update our inode's times */
- if (likely(!err))
+ if (!err)
unionfs_copy_attr_times(dentry->d_inode);
dput(lower_dentry);
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
unlock_dir(lower_dir_dentry);
- if (unlikely(err && !IS_COPYUP_ERR(err)))
+ if (err && !IS_COPYUP_ERR(err))
goto out;
if (err) {
err = create_whiteout(dentry, dbstart(dentry));
out:
- if (likely(!err))
+ if (!err)
dentry->d_inode->i_nlink--;
/* We don't want to leave negative leftover dentries for revalidate. */
- if (likely(!err && (dbopaque(dentry) != -1)))
+ if (!err && (dbopaque(dentry) != -1))
update_bstart(dentry);
return err;
err = unionfs_unlink_whiteout(dir, dentry);
/* call d_drop so the system "forgets" about us */
- if (likely(!err)) {
+ if (!err) {
if (!S_ISDIR(dentry->d_inode->i_mode))
unionfs_postcopyup_release(dentry);
d_drop(dentry);
}
out:
- if (likely(!err)) {
+ if (!err) {
unionfs_check_dentry(dentry);
unionfs_check_inode(dir);
}
/* Here we need to remove whiteout entries. */
err = delete_whiteouts(dentry, dbstart(dentry), namelist);
- if (unlikely(err))
+ if (err)
goto out;
lower_dentry = unionfs_lower_dentry(dentry);
dentry->d_inode->i_nlink = unionfs_get_nlinks(dentry->d_inode);
out:
- if (likely(lower_dir_dentry))
+ if (lower_dir_dentry)
unlock_dir(lower_dir_dentry);
return err;
}
/* check if this unionfs directory is empty or not */
err = check_empty(dentry, &namelist);
- if (unlikely(err))
+ if (err)
goto out;
err = unionfs_rmdir_first(dir, dentry, namelist);
goto out;
/* exit if the error returned was NOT -EROFS */
- if (unlikely(!IS_COPYUP_ERR(err)))
+ if (!IS_COPYUP_ERR(err))
goto out;
new_err = create_whiteout(dentry, dbstart(dentry) - 1);
out:
/* call d_drop so the system "forgets" about us */
- if (likely(!err))
+ if (!err)
d_drop(dentry);
- if (likely(namelist))
+ if (namelist)
free_rdstate(namelist);
unionfs_unlock_dentry(dentry);
{
void *ptr;
- if (unlikely(size > limit))
+ if (size > limit)
return ERR_PTR(-E2BIG);
if (!size) /* size request, no buffer is needed */
projects / unionfs-2.6.21.y.git / commitdiff