Unverified Commit 689ecd06 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Rename ntfs3_setattr into ntfs_setattr 



Aligning names to a single naming convention.

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

fs/ntfs3/file.c

+4 −4
Original line number Diff line number Diff line
@@ -789,9 +789,9 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
}



/*

 * ntfs3_setattr - inode_operations::setattr

 * ntfs_setattr - inode_operations::setattr

 */

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

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

		 struct iattr *attr)

{

	struct inode *inode = d_inode(dentry);
@@ -1370,7 +1370,7 @@ static ssize_t ntfs_file_splice_write(struct pipe_inode_info *pipe, 
// clang-format off

const struct inode_operations ntfs_file_inode_operations = {

	.getattr	= ntfs_getattr,

	.setattr	= ntfs3_setattr,

	.setattr	= ntfs_setattr,

	.listxattr	= ntfs_listxattr,

	.get_acl	= ntfs_get_acl,

	.set_acl	= ntfs_set_acl,

fs/ntfs3/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static const char *ntfs_get_link(struct dentry *de, struct inode *inode, 
// clang-format off

const struct inode_operations ntfs_link_inode_operations = {

	.get_link	= ntfs_get_link,

	.setattr	= ntfs3_setattr,

	.setattr	= ntfs_setattr,

	.listxattr	= ntfs_listxattr,

};

fs/ntfs3/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ const struct inode_operations ntfs_dir_inode_operations = { 
	.rename		= ntfs_rename,

	.get_acl	= ntfs_get_acl,

	.set_acl	= ntfs_set_acl,

	.setattr	= ntfs3_setattr,

	.setattr	= ntfs_setattr,

	.getattr	= ntfs_getattr,

	.listxattr	= ntfs_listxattr,

	.fiemap		= ntfs_fiemap,
@@ -512,7 +512,7 @@ const struct inode_operations ntfs_dir_inode_operations = { 
};



const struct inode_operations ntfs_special_inode_operations = {

	.setattr	= ntfs3_setattr,

	.setattr	= ntfs_setattr,

	.getattr	= ntfs_getattr,

	.listxattr	= ntfs_listxattr,

	.get_acl	= ntfs_get_acl,

fs/ntfs3/ntfs_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ int ntfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry, 
		      struct fileattr *fa);

int ntfs_getattr(struct mnt_idmap *idmap, const struct path *path,

		 struct kstat *stat, u32 request_mask, u32 flags);

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

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

		 struct iattr *attr);

int ntfs_file_open(struct inode *inode, struct file *file);

int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

fs/ntfs3/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ int ntfs_init_acl(struct mnt_idmap *idmap, struct inode *inode, 
#endif



/*

 * ntfs_acl_chmod - Helper for ntfs3_setattr().

 * ntfs_acl_chmod - Helper for ntfs_setattr().

 */

int ntfs_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry)

{