Commit 6e195b0f authored by Dominique Martinet's avatar Dominique Martinet
Browse files

9p: fix a bunch of checkpatch warnings 

Sohaib Mohamed started a serie of tiny and incomplete checkpatch fixes but
seemingly stopped halfway -- take over and do most of it.
This is still missing net/9p/trans* and net/9p/protocol.c for a later
time...

Link: http://lkml.kernel.org/r/20211102134608.1588018-3-dominique.martinet@atmark-techno.com


Signed-off-by: default avatarDominique Martinet <asmadeus@codewreck.org>
parent b1843d23

fs/9p/acl.c

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ static int v9fs_set_acl(struct p9_fid *fid, int type, struct posix_acl *acl) 
	char *name;

	size_t size;

	void *buffer;



	if (!acl)

		return 0;

fs/9p/acl.h

+9 −8
Original line number Diff line number Diff line
@@ -7,14 +7,15 @@ 
#define FS_9P_ACL_H



#ifdef CONFIG_9P_FS_POSIX_ACL

extern int v9fs_get_acl(struct inode *, struct p9_fid *);

extern struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type, bool rcu);

extern int v9fs_acl_chmod(struct inode *, struct p9_fid *);

extern int v9fs_set_create_acl(struct inode *, struct p9_fid *,

			       struct posix_acl *, struct posix_acl *);

extern int v9fs_acl_mode(struct inode *dir, umode_t *modep,

int v9fs_get_acl(struct inode *inode, struct p9_fid *fid);

struct posix_acl *v9fs_iop_get_acl(struct inode *inode, int type,

				   bool rcu);

int v9fs_acl_chmod(struct inode *inode, struct p9_fid *fid);

int v9fs_set_create_acl(struct inode *inode, struct p9_fid *fid,

			struct posix_acl *dacl, struct posix_acl *acl);

int v9fs_acl_mode(struct inode *dir, umode_t *modep,

		  struct posix_acl **dpacl, struct posix_acl **pacl);

extern void v9fs_put_acl(struct posix_acl *dacl, struct posix_acl *acl);

void v9fs_put_acl(struct posix_acl *dacl, struct posix_acl *acl);

#else

#define v9fs_iop_get_acl NULL

static inline int v9fs_get_acl(struct inode *inode, struct p9_fid *fid)

fs/9p/v9fs.c

+4 −0
Original line number Diff line number Diff line
@@ -188,8 +188,10 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) 


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

		int token, r;



		if (!*p)

			continue;



		token = match_token(p, tokens, args);

		switch (token) {

		case Opt_debug:
@@ -659,6 +661,7 @@ static void v9fs_destroy_inode_cache(void) 
static int v9fs_cache_register(void)

{

	int ret;



	ret = v9fs_init_inode_cache();

	if (ret < 0)

		return ret;
@@ -686,6 +689,7 @@ static void v9fs_cache_unregister(void) 
static int __init init_v9fs(void)

{

	int err;



	pr_info("Installing v9fs 9p2000 file system support\n");

	/* TODO: Setup list of registered trasnport modules */

fs/9p/v9fs_vfs.h

+6 −5
Original line number Diff line number Diff line
@@ -44,9 +44,10 @@ extern struct kmem_cache *v9fs_inode_cache; 


struct inode *v9fs_alloc_inode(struct super_block *sb);

void v9fs_free_inode(struct inode *inode);

struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode, dev_t);

struct inode *v9fs_get_inode(struct super_block *sb, umode_t mode,

			     dev_t rdev);

int v9fs_init_inode(struct v9fs_session_info *v9ses,

		    struct inode *inode, umode_t mode, dev_t);

		    struct inode *inode, umode_t mode, dev_t rdev);

void v9fs_evict_inode(struct inode *inode);

ino_t v9fs_qid2ino(struct p9_qid *qid);

void v9fs_stat2inode(struct p9_wstat *stat, struct inode *inode,
@@ -59,8 +60,8 @@ void v9fs_inode2stat(struct inode *inode, struct p9_wstat *stat); 
int v9fs_uflags2omode(int uflags, int extended);



void v9fs_blank_wstat(struct p9_wstat *wstat);

int v9fs_vfs_setattr_dotl(struct user_namespace *, struct dentry *,

			  struct iattr *);

int v9fs_vfs_setattr_dotl(struct user_namespace *mnt_userns,

			  struct dentry *dentry, struct iattr *iattr);

int v9fs_file_fsync_dotl(struct file *filp, loff_t start, loff_t end,

			 int datasync);

int v9fs_refresh_inode(struct p9_fid *fid, struct inode *inode);
@@ -68,9 +69,9 @@ int v9fs_refresh_inode_dotl(struct p9_fid *fid, struct inode *inode); 
static inline void v9fs_invalidate_inode_attr(struct inode *inode)

{

	struct v9fs_inode *v9inode;



	v9inode = V9FS_I(inode);

	v9inode->cache_validity |= V9FS_INO_INVALID_ATTR;

	return;

}



int v9fs_open_to_dotl_flags(int flags);

fs/9p/vfs_addr.c

+4 −2
Original line number Diff line number Diff line
@@ -247,11 +247,13 @@ v9fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	loff_t pos = iocb->ki_pos;

	ssize_t n;

	int err = 0;



	if (iov_iter_rw(iter) == WRITE) {

		n = p9_client_write(file->private_data, pos, iter, &err);

		if (n) {

			struct inode *inode = file_inode(file);

			loff_t i_size = i_size_read(inode);



			if (pos + n > i_size)

				inode_add_bytes(inode, pos + n - i_size);

		}
@@ -262,7 +264,7 @@ v9fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
}



static int v9fs_write_begin(struct file *filp, struct address_space *mapping,

			    loff_t pos, unsigned len, unsigned flags,

			    loff_t pos, unsigned int len, unsigned int flags,

			    struct page **pagep, void **fsdata)

{

	int retval;
@@ -287,7 +289,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping, 
}



static int v9fs_write_end(struct file *filp, struct address_space *mapping,

			  loff_t pos, unsigned len, unsigned copied,

			  loff_t pos, unsigned int len, unsigned int copied,

			  struct page *page, void *fsdata)

{

	loff_t last_pos = pos + copied;