nilfs2: fix block comments
This fixes block comments with proper formatting to eliminate the following checkpatch.pl warnings: "WARNING: Block comments use * on subsequent lines" "WARNING: Block comments use a trailing */ on a separate line" Link: http://lkml.kernel.org/r/1462886671-3521-8-git-send-email-konishi.ryusuke@lab.ntt.co.jp Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ryusuke Konishi
committed by
Linus Torvalds
Linus Torvalds
parent
80d6505232
commit
076a378ba6
@@ -129,11 +129,14 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,
|
||||
/* Error handling should be detailed */
|
||||
set_buffer_new(bh_result);
|
||||
set_buffer_delay(bh_result);
|
||||
map_bh(bh_result, inode->i_sb, 0); /* dbn must be changed
|
||||
to proper value */
|
||||
map_bh(bh_result, inode->i_sb, 0);
|
||||
/* Disk block number must be changed to proper value */
|
||||
|
||||
} else if (ret == -ENOENT) {
|
||||
/* not found is not error (e.g. hole); must return without
|
||||
the mapped state flag. */
|
||||
/*
|
||||
* not found is not error (e.g. hole); must return without
|
||||
* the mapped state flag.
|
||||
*/
|
||||
;
|
||||
} else {
|
||||
err = ret;
|
||||
@@ -395,23 +398,26 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode)
|
||||
|
||||
err = nilfs_init_acl(inode, dir);
|
||||
if (unlikely(err))
|
||||
goto failed_after_creation; /* never occur. When supporting
|
||||
nilfs_init_acl(), proper cancellation of
|
||||
above jobs should be considered */
|
||||
/*
|
||||
* Never occur. When supporting nilfs_init_acl(),
|
||||
* proper cancellation of above jobs should be considered.
|
||||
*/
|
||||
goto failed_after_creation;
|
||||
|
||||
return inode;
|
||||
|
||||
failed_after_creation:
|
||||
clear_nlink(inode);
|
||||
unlock_new_inode(inode);
|
||||
iput(inode); /* raw_inode will be deleted through
|
||||
nilfs_evict_inode() */
|
||||
iput(inode); /*
|
||||
* raw_inode will be deleted through
|
||||
* nilfs_evict_inode().
|
||||
*/
|
||||
goto failed;
|
||||
|
||||
failed_ifile_create_inode:
|
||||
make_bad_inode(inode);
|
||||
iput(inode); /* if i_nlink == 1, generic_forget_inode() will be
|
||||
called */
|
||||
iput(inode);
|
||||
failed:
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
@@ -662,8 +668,10 @@ void nilfs_write_inode_common(struct inode *inode,
|
||||
else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
|
||||
raw_inode->i_device_code =
|
||||
cpu_to_le64(huge_encode_dev(inode->i_rdev));
|
||||
/* When extending inode, nilfs->ns_inode_size should be checked
|
||||
for substitutions of appended fields */
|
||||
/*
|
||||
* When extending inode, nilfs->ns_inode_size should be checked
|
||||
* for substitutions of appended fields.
|
||||
*/
|
||||
}
|
||||
|
||||
void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh, int flags)
|
||||
@@ -681,9 +689,12 @@ void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh, int flags)
|
||||
set_bit(NILFS_I_INODE_SYNC, &ii->i_state);
|
||||
|
||||
nilfs_write_inode_common(inode, raw_inode, 0);
|
||||
/* XXX: call with has_bmap = 0 is a workaround to avoid
|
||||
deadlock of bmap. This delays update of i_bmap to just
|
||||
before writing */
|
||||
/*
|
||||
* XXX: call with has_bmap = 0 is a workaround to avoid
|
||||
* deadlock of bmap. This delays update of i_bmap to just
|
||||
* before writing.
|
||||
*/
|
||||
|
||||
nilfs_ifile_unmap_inode(ifile, ino, ibh);
|
||||
}
|
||||
|
||||
@@ -748,8 +759,10 @@ void nilfs_truncate(struct inode *inode)
|
||||
nilfs_mark_inode_dirty(inode);
|
||||
nilfs_set_file_dirty(inode, 0);
|
||||
nilfs_transaction_commit(sb);
|
||||
/* May construct a logical segment and may fail in sync mode.
|
||||
But truncate has no return value. */
|
||||
/*
|
||||
* May construct a logical segment and may fail in sync mode.
|
||||
* But truncate has no return value.
|
||||
*/
|
||||
}
|
||||
|
||||
static void nilfs_clear_inode(struct inode *inode)
|
||||
@@ -806,8 +819,10 @@ void nilfs_evict_inode(struct inode *inode)
|
||||
if (IS_SYNC(inode))
|
||||
nilfs_set_transaction_flag(NILFS_TI_SYNC);
|
||||
nilfs_transaction_commit(sb);
|
||||
/* May construct a logical segment and may fail in sync mode.
|
||||
But delete_inode has no return value. */
|
||||
/*
|
||||
* May construct a logical segment and may fail in sync mode.
|
||||
* But delete_inode has no return value.
|
||||
*/
|
||||
}
|
||||
|
||||
int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
|
||||
@@ -915,17 +930,23 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned int nr_dirty)
|
||||
spin_lock(&nilfs->ns_inode_lock);
|
||||
if (!test_bit(NILFS_I_QUEUED, &ii->i_state) &&
|
||||
!test_bit(NILFS_I_BUSY, &ii->i_state)) {
|
||||
/* Because this routine may race with nilfs_dispose_list(),
|
||||
we have to check NILFS_I_QUEUED here, too. */
|
||||
/*
|
||||
* Because this routine may race with nilfs_dispose_list(),
|
||||
* we have to check NILFS_I_QUEUED here, too.
|
||||
*/
|
||||
if (list_empty(&ii->i_dirty) && igrab(inode) == NULL) {
|
||||
/* This will happen when somebody is freeing
|
||||
this inode. */
|
||||
/*
|
||||
* This will happen when somebody is freeing
|
||||
* this inode.
|
||||
*/
|
||||
nilfs_warning(inode->i_sb, __func__,
|
||||
"cannot get inode (ino=%lu)",
|
||||
inode->i_ino);
|
||||
spin_unlock(&nilfs->ns_inode_lock);
|
||||
return -EINVAL; /* NILFS_I_DIRTY may remain for
|
||||
freeing inode */
|
||||
return -EINVAL; /*
|
||||
* NILFS_I_DIRTY may remain for
|
||||
* freeing inode.
|
||||
*/
|
||||
}
|
||||
list_move_tail(&ii->i_dirty, &nilfs->ns_dirty_files);
|
||||
set_bit(NILFS_I_QUEUED, &ii->i_state);
|
||||
|
||||
Reference in New Issue
Block a user