Skip to content

Commit

Permalink
nilfs2: add missing line spacing
Browse files Browse the repository at this point in the history
Clean up checkpatch.pl warnings "WARNING: Missing a blank line after
declarations" from nilfs2.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ryusuke Konishi <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
konis authored and torvalds committed May 24, 2016
1 parent e7a142a commit 4ad364c
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/nilfs2/cpfile.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static unsigned long
nilfs_cpfile_get_blkoff(const struct inode *cpfile, __u64 cno)
{
__u64 tcno = cno + NILFS_MDT(cpfile)->mi_first_entry_offset - 1;

do_div(tcno, nilfs_cpfile_checkpoints_per_block(cpfile));
return (unsigned long)tcno;
}
Expand All @@ -46,6 +47,7 @@ static unsigned long
nilfs_cpfile_get_offset(const struct inode *cpfile, __u64 cno)
{
__u64 tcno = cno + NILFS_MDT(cpfile)->mi_first_entry_offset - 1;

return do_div(tcno, nilfs_cpfile_checkpoints_per_block(cpfile));
}

Expand Down
2 changes: 2 additions & 0 deletions fs/nilfs2/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ static unsigned nilfs_last_byte(struct inode *inode, unsigned long page_nr)
static int nilfs_prepare_chunk(struct page *page, unsigned from, unsigned to)
{
loff_t pos = page_offset(page) + from;

return __block_write_begin(page, pos, to - from, nilfs_get_block);
}

Expand Down Expand Up @@ -336,6 +337,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
n = start;
do {
char *kaddr;

page = nilfs_get_page(dir, n);
if (!IS_ERR(page)) {
kaddr = page_address(page);
Expand Down
1 change: 1 addition & 0 deletions fs/nilfs2/ifile.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ static inline struct nilfs_inode *
nilfs_ifile_map_inode(struct inode *ifile, ino_t ino, struct buffer_head *ibh)
{
void *kaddr = kmap(ibh->b_page);

return nilfs_palloc_block_get_entry(ifile, ino, ibh, kaddr);
}

Expand Down
1 change: 1 addition & 0 deletions fs/nilfs2/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,7 @@ int nilfs_setattr(struct dentry *dentry, struct iattr *iattr)
int nilfs_permission(struct inode *inode, int mask)
{
struct nilfs_root *root = NILFS_I(inode)->i_root;

if ((mask & MAY_WRITE) && root &&
root->cno != NILFS_CPTREE_CURRENT_CNO)
return -EROFS; /* snapshot is not writable */
Expand Down
1 change: 1 addition & 0 deletions fs/nilfs2/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
static inline int nilfs_add_nondir(struct dentry *dentry, struct inode *inode)
{
int err = nilfs_add_link(dentry, inode);

if (!err) {
d_instantiate(dentry, inode);
unlock_new_inode(inode);
Expand Down
1 change: 1 addition & 0 deletions fs/nilfs2/recovery.c
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,
0, &page, nilfs_get_block);
if (unlikely(err)) {
loff_t isize = inode->i_size;

if (pos + blocksize > isize)
nilfs_write_failed(inode->i_mapping,
pos + blocksize);
Expand Down
1 change: 1 addition & 0 deletions fs/nilfs2/segment.c
Original file line number Diff line number Diff line change
Expand Up @@ -2391,6 +2391,7 @@ static int nilfs_segctor_construct(struct nilfs_sc_info *sci, int mode)
static void nilfs_construction_timeout(unsigned long data)
{
struct task_struct *p = (struct task_struct *)data;

wake_up_process(p);
}

Expand Down
2 changes: 2 additions & 0 deletions fs/nilfs2/sufile.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ static unsigned long
nilfs_sufile_get_blkoff(const struct inode *sufile, __u64 segnum)
{
__u64 t = segnum + NILFS_MDT(sufile)->mi_first_entry_offset;

do_div(t, nilfs_sufile_segment_usages_per_block(sufile));
return (unsigned long)t;
}
Expand All @@ -65,6 +66,7 @@ static unsigned long
nilfs_sufile_get_offset(const struct inode *sufile, __u64 segnum)
{
__u64 t = segnum + NILFS_MDT(sufile)->mi_first_entry_offset;

return do_div(t, nilfs_sufile_segment_usages_per_block(sufile));
}

Expand Down
1 change: 1 addition & 0 deletions fs/nilfs2/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,7 @@ static int parse_options(char *options, struct super_block *sb, int is_remount)

while ((p = strsep(&options, ",")) != NULL) {
int token;

if (!*p)
continue;

Expand Down
2 changes: 2 additions & 0 deletions fs/nilfs2/the_nilfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,15 @@ struct nilfs_root {
static inline int nilfs_sb_need_update(struct the_nilfs *nilfs)
{
u64 t = get_seconds();

return t < nilfs->ns_sbwtime ||
t > nilfs->ns_sbwtime + nilfs->ns_sb_update_freq;
}

static inline int nilfs_sb_will_flip(struct the_nilfs *nilfs)
{
int flip_bits = nilfs->ns_sbwcount & 0x0FL;

return (flip_bits != 0x08 && flip_bits != 0x0F);
}

Expand Down

0 comments on commit 4ad364c

Please sign in to comment.