Unverified Commit f0377761 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Code formatting 



clang-format-15 was used to format code according kernel's .clang-format.

Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent f1d325b8

fs/ntfs3/frecord.c

+10 −6
Original line number Diff line number Diff line
@@ -517,6 +517,9 @@ ni_ins_new_attr(struct ntfs_inode *ni, struct mft_inode *mi, 
 */

static int ni_repack(struct ntfs_inode *ni)

{

#if 1

	return 0;

#else

	int err = 0;

	struct ntfs_sb_info *sbi = ni->mi.sbi;

	struct mft_inode *mi, *mi_p = NULL;
@@ -639,6 +642,7 @@ static int ni_repack(struct ntfs_inode *ni) 


	run_close(&run);

	return err;

#endif

}



/*

fs/ntfs3/inode.c

+9 −9
Original line number Diff line number Diff line
@@ -1194,8 +1194,8 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, 
 *

 * NOTE: if fnd != NULL (ntfs_atomic_open) then @dir is locked

 */

struct inode *ntfs_create_inode(struct mnt_idmap *idmap,

				struct inode *dir, struct dentry *dentry,

struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,

				struct dentry *dentry,

				const struct cpu_str *uni, umode_t mode,

				dev_t dev, const char *symname, u32 size,

				struct ntfs_fnd *fnd)

fs/ntfs3/namei.c

+8 −8
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ static int ntfs_create(struct mnt_idmap *idmap, struct inode *dir, 
{

	struct inode *inode;



	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFREG | mode,

				  0, NULL, 0, NULL);

	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFREG | mode, 0,

				  NULL, 0, NULL);



	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

}
@@ -125,8 +125,8 @@ static int ntfs_mknod(struct mnt_idmap *idmap, struct inode *dir, 
{

	struct inode *inode;



	inode = ntfs_create_inode(idmap, dir, dentry, NULL, mode, rdev,

				  NULL, 0, NULL);

	inode = ntfs_create_inode(idmap, dir, dentry, NULL, mode, rdev, NULL, 0,

				  NULL);



	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

}
@@ -199,8 +199,8 @@ static int ntfs_symlink(struct mnt_idmap *idmap, struct inode *dir, 
	u32 size = strlen(symname);

	struct inode *inode;



	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFLNK | 0777,

				  0, symname, size, NULL);

	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFLNK | 0777, 0,

				  symname, size, NULL);



	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

}
@@ -213,8 +213,8 @@ static int ntfs_mkdir(struct mnt_idmap *idmap, struct inode *dir, 
{

	struct inode *inode;



	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFDIR | mode,

				  0, NULL, 0, NULL);

	inode = ntfs_create_inode(idmap, dir, dentry, NULL, S_IFDIR | mode, 0,

				  NULL, 0, NULL);



	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

}

fs/ntfs3/ntfs_fs.h

+5 −5
Original line number Diff line number Diff line
@@ -708,8 +708,8 @@ int ntfs_sync_inode(struct inode *inode); 
int ntfs_flush_inodes(struct super_block *sb, struct inode *i1,

		      struct inode *i2);

int inode_write_data(struct inode *inode, const void *data, size_t bytes);

struct inode *ntfs_create_inode(struct mnt_idmap *idmap,

				struct inode *dir, struct dentry *dentry,

struct inode *ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,

				struct dentry *dentry,

				const struct cpu_str *uni, umode_t mode,

				dev_t dev, const char *symname, u32 size,

				struct ntfs_fnd *fnd);
@@ -858,8 +858,8 @@ unsigned long ntfs_names_hash(const u16 *name, size_t len, const u16 *upcase, 


/* globals from xattr.c */

#ifdef CONFIG_NTFS3_FS_POSIX_ACL

struct posix_acl *ntfs_get_acl(struct mnt_idmap *idmap,

			       struct dentry *dentry, int type);

struct posix_acl *ntfs_get_acl(struct mnt_idmap *idmap, struct dentry *dentry,

			       int type);

int ntfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

		 struct posix_acl *acl, int type);

int ntfs_init_acl(struct mnt_idmap *idmap, struct inode *inode,

fs/ntfs3/super.c

+12 −5
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ enum Opt { 
	Opt_err,

};



// clang-format off

static const struct fs_parameter_spec ntfs_fs_parameters[] = {

	fsparam_u32("uid",			Opt_uid),

	fsparam_u32("gid",			Opt_gid),
@@ -277,9 +278,13 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = { 
	fsparam_flag_no("nocase",		Opt_nocase),

	{}

};

// clang-format on



/*

 * Load nls table or if @nls is utf8 then return NULL.

 *

 * It is good idea to use here "const char *nls".

 * But load_nls accepts "char*".

 */

static struct nls_table *ntfs_load_nls(char *nls)

{
@@ -1537,12 +1542,14 @@ static void ntfs_fs_free(struct fs_context *fc) 
		put_mount_options(opts);

}



// clang-format off

static const struct fs_context_operations ntfs_context_ops = {

	.parse_param	= ntfs_fs_parse_param,

	.get_tree	= ntfs_fs_get_tree,

	.reconfigure	= ntfs_fs_reconfigure,

	.free		= ntfs_fs_free,

};

// clang-format on



/*

 * ntfs_init_fs_context - Initialize sbi and opts