Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ad364ca authored May 23, 2016 by Ryusuke Konishi Committed by Linus Torvalds May 23, 2016

nilfs2: add missing line spacing

Clean up checkpatch.pl warnings "WARNING: Missing a blank line after
declarations" from nilfs2.

Link: http://lkml.kernel.org/r/1461935747-10380-11-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>

parent e7a142aa

fs/nilfs2/cpfile.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ static unsigned long
	nilfs_cpfile_get_blkoff(const struct inode *cpfile, __u64 cno)		nilfs_cpfile_get_blkoff(const struct inode *cpfile, __u64 cno)
	{		{
	__u64 tcno = cno + NILFS_MDT(cpfile)->mi_first_entry_offset - 1;		__u64 tcno = cno + NILFS_MDT(cpfile)->mi_first_entry_offset - 1;

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

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

fs/nilfs2/dir.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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)		static int nilfs_prepare_chunk(struct page *page, unsigned from, unsigned to)
	{		{
	loff_t pos = page_offset(page) + from;		loff_t pos = page_offset(page) + from;

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

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

	page = nilfs_get_page(dir, n);		page = nilfs_get_page(dir, n);
	if (!IS_ERR(page)) {		if (!IS_ERR(page)) {
	kaddr = page_address(page);		kaddr = page_address(page);

fs/nilfs2/ifile.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ static inline struct nilfs_inode *
	nilfs_ifile_map_inode(struct inode ifile, ino_t ino, struct buffer_head ibh)		nilfs_ifile_map_inode(struct inode ifile, ino_t ino, struct buffer_head ibh)
	{		{
	void *kaddr = kmap(ibh->b_page);		void *kaddr = kmap(ibh->b_page);

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

fs/nilfs2/inode.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -851,6 +851,7 @@ int nilfs_setattr(struct dentry dentry, struct iattr iattr)
	int nilfs_permission(struct inode *inode, int mask)		int nilfs_permission(struct inode *inode, int mask)
	{		{
	struct nilfs_root *root = NILFS_I(inode)->i_root;		struct nilfs_root *root = NILFS_I(inode)->i_root;

	if ((mask & MAY_WRITE) && root &&		if ((mask & MAY_WRITE) && root &&
	root->cno != NILFS_CPTREE_CURRENT_CNO)		root->cno != NILFS_CPTREE_CURRENT_CNO)
	return -EROFS; /* snapshot is not writable */		return -EROFS; /* snapshot is not writable */

fs/nilfs2/namei.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,7 @@
	static inline int nilfs_add_nondir(struct dentry dentry, struct inode inode)		static inline int nilfs_add_nondir(struct dentry dentry, struct inode inode)
	{		{
	int err = nilfs_add_link(dentry, inode);		int err = nilfs_add_link(dentry, inode);

	if (!err) {		if (!err) {
	d_instantiate(dentry, inode);		d_instantiate(dentry, inode);
	unlock_new_inode(inode);		unlock_new_inode(inode);