Commit 051c3556 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs 

Pull ext2 and reiserfs cleanups from Jan Kara:
 "Two small cleanups for ext2 and one for reiserfs"

* tag 'for_v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  reiserfs: Replace kmalloc with kcalloc in the comment
  ext2: code cleanup by removing ifdef macro surrounding
  ext2: Fix i_op setting for special inode
parents 07c8f3bf 5626de1e

fs/ext2/file.c

+0 −2
Original line number Diff line number Diff line
@@ -196,9 +196,7 @@ const struct file_operations ext2_file_operations = { 
};



const struct inode_operations ext2_file_inode_operations = {

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

	.get_acl	= ext2_get_acl,

fs/ext2/namei.c

+0 −6
Original line number Diff line number Diff line
@@ -136,9 +136,7 @@ static int ext2_mknod (struct inode * dir, struct dentry *dentry, umode_t mode, 
	err = PTR_ERR(inode);

	if (!IS_ERR(inode)) {

		init_special_inode(inode, inode->i_mode, rdev);

#ifdef CONFIG_EXT2_FS_XATTR

		inode->i_op = &ext2_special_inode_operations;

#endif

		mark_inode_dirty(inode);

		err = ext2_add_nondir(dentry, inode);

	}
@@ -413,9 +411,7 @@ const struct inode_operations ext2_dir_inode_operations = { 
	.rmdir		= ext2_rmdir,

	.mknod		= ext2_mknod,

	.rename		= ext2_rename,

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

	.get_acl	= ext2_get_acl,
@@ -424,9 +420,7 @@ const struct inode_operations ext2_dir_inode_operations = { 
};



const struct inode_operations ext2_special_inode_operations = {

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

	.get_acl	= ext2_get_acl,

fs/ext2/symlink.c

+0 −4
Original line number Diff line number Diff line
@@ -25,16 +25,12 @@ const struct inode_operations ext2_symlink_inode_operations = { 
	.get_link	= page_get_link,

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

};

 

const struct inode_operations ext2_fast_symlink_inode_operations = {

	.get_link	= simple_get_link,

	.getattr	= ext2_getattr,

	.setattr	= ext2_setattr,

#ifdef CONFIG_EXT2_FS_XATTR

	.listxattr	= ext2_listxattr,

#endif

};

fs/ext2/xattr.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static inline void ext2_xattr_destroy_cache(struct mb_cache *cache) 
}



#define ext2_xattr_handlers NULL

#define ext2_listxattr NULL



# endif  /* CONFIG_EXT2_FS_XATTR */

fs/reiserfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ research: 
			} else {

				/* paste hole to the indirect item */

				/*

				 * If kmalloc failed, max_to_insert becomes

				 * If kcalloc failed, max_to_insert becomes

				 * zero and it means we only have space for

				 * one block

				 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE