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

Commit 826843a3 authored by Evgeniy Dushistov's avatar Evgeniy Dushistov Committed by Linus Torvalds
Browse files

[PATCH] ufs: directory and page cache: install aops 

This series of patches finished "bugs fixing" mentioned
here http://lkml.org/lkml/2006/1/31/275

 .

The main bugs:
* for i in `seq 1 1000`; do touch $i; done - crash system
* mkdir create directory without "." and ".." entries

The suggested solution is work with page cache instead of straight work
with blocks.  Such solution has following advantages

* reduce code size and its complexity
* some global locks go away
* fix bugs

The most part of code is stolen from ext2, because of it has similar
directory structure.

Patches testes with UFS1 and UFS2 file systems.

This patch installs i_mapping->a_ops for directory inodes and removes some
duplicated code.

Signed-off-by: default avatarEvgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6ef4d6bf

fs/ufs/inode.c

+24 −34
Original line number Diff line number Diff line
@@ -552,6 +552,28 @@ struct address_space_operations ufs_aops = { 
	.bmap = ufs_bmap

};



static void ufs_set_inode_ops(struct inode *inode)

{

	if (S_ISREG(inode->i_mode)) {

		inode->i_op = &ufs_file_inode_operations;

		inode->i_fop = &ufs_file_operations;

		inode->i_mapping->a_ops = &ufs_aops;

	} else if (S_ISDIR(inode->i_mode)) {

		inode->i_op = &ufs_dir_inode_operations;

		inode->i_fop = &ufs_dir_operations;

		inode->i_mapping->a_ops = &ufs_aops;

	} else if (S_ISLNK(inode->i_mode)) {

		if (!inode->i_blocks)

			inode->i_op = &ufs_fast_symlink_inode_operations;

		else {

			inode->i_op = &page_symlink_inode_operations;

			inode->i_mapping->a_ops = &ufs_aops;

		}

	} else

		init_special_inode(inode, inode->i_mode,

				   ufs_get_inode_dev(inode->i_sb, UFS_I(inode)));

}



void ufs_read_inode (struct inode * inode)

{

	struct ufs_inode_info *ufsi = UFS_I(inode);
@@ -626,23 +648,7 @@ void ufs_read_inode (struct inode * inode) 
	}

	ufsi->i_osync = 0;



	if (S_ISREG(inode->i_mode)) {

		inode->i_op = &ufs_file_inode_operations;

		inode->i_fop = &ufs_file_operations;

		inode->i_mapping->a_ops = &ufs_aops;

	} else if (S_ISDIR(inode->i_mode)) {

		inode->i_op = &ufs_dir_inode_operations;

		inode->i_fop = &ufs_dir_operations;

	} else if (S_ISLNK(inode->i_mode)) {

		if (!inode->i_blocks)

			inode->i_op = &ufs_fast_symlink_inode_operations;

		else {

			inode->i_op = &page_symlink_inode_operations;

			inode->i_mapping->a_ops = &ufs_aops;

		}

	} else

		init_special_inode(inode, inode->i_mode,

			ufs_get_inode_dev(sb, ufsi));

	ufs_set_inode_ops(inode);



	brelse (bh);
@@ -702,23 +708,7 @@ ufs2_inode : 
	}

	ufsi->i_osync = 0;



	if (S_ISREG(inode->i_mode)) {

		inode->i_op = &ufs_file_inode_operations;

		inode->i_fop = &ufs_file_operations;

		inode->i_mapping->a_ops = &ufs_aops;

	} else if (S_ISDIR(inode->i_mode)) {

		inode->i_op = &ufs_dir_inode_operations;

		inode->i_fop = &ufs_dir_operations;

	} else if (S_ISLNK(inode->i_mode)) {

		if (!inode->i_blocks)

			inode->i_op = &ufs_fast_symlink_inode_operations;

		else {

			inode->i_op = &page_symlink_inode_operations;

			inode->i_mapping->a_ops = &ufs_aops;

		}

	} else   /* TODO  : here ...*/

		init_special_inode(inode, inode->i_mode,

			ufs_get_inode_dev(sb, ufsi));

	ufs_set_inode_ops(inode);



	brelse(bh);

fs/ufs/namei.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static int ufs_mkdir(struct inode * dir, struct dentry * dentry, int mode) 


	inode->i_op = &ufs_dir_inode_operations;

	inode->i_fop = &ufs_dir_operations;

	inode->i_mapping->a_ops = &ufs_aops;



	inode_inc_link_count(inode);