[readdir] convert bfs

... and get rid of that ridiculous mutex in bfs_readdir() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

[readdir] convert bfs
... and get rid of that ridiculous mutex in bfs_readdir() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro
1 parent f0c3b5093a
Showing 1 changed file with 14 additions and 21 deletions Side-by-side Diff
fs/bfs/dir.c
@@ -26,58 +26,51 @@
 				const unsigned char *name, int namelen,
 				struct bfs_dirent **res_dir);
  
-static int bfs_readdir(struct file *f, void *dirent, filldir_t filldir)
+static int bfs_readdir(struct file *f, struct dir_context *ctx)
 {
 	struct inode *dir = file_inode(f);
 	struct buffer_head *bh;
 	struct bfs_dirent *de;
-	struct bfs_sb_info *info = BFS_SB(dir->i_sb);
 	unsigned int offset;
 	int block;
  
-	mutex_lock(&info->bfs_lock);
-
-	if (f->f_pos & (BFS_DIRENT_SIZE - 1)) {
+	if (ctx->pos & (BFS_DIRENT_SIZE - 1)) {
 		printf("Bad f_pos=%08lx for %s:%08lx\n",
-					(unsigned long)f->f_pos,
+					(unsigned long)ctx->pos,
 					dir->i_sb->s_id, dir->i_ino);
-		mutex_unlock(&info->bfs_lock);
-		return -EBADF;
+		return -EINVAL;
 	}
  
-	while (f->f_pos < dir->i_size) {
-		offset = f->f_pos & (BFS_BSIZE - 1);
-		block = BFS_I(dir)->i_sblock + (f->f_pos >> BFS_BSIZE_BITS);
+	while (ctx->pos < dir->i_size) {
+		offset = ctx->pos & (BFS_BSIZE - 1);
+		block = BFS_I(dir)->i_sblock + (ctx->pos >> BFS_BSIZE_BITS);
 		bh = sb_bread(dir->i_sb, block);
 		if (!bh) {
-			f->f_pos += BFS_BSIZE - offset;
+			ctx->pos += BFS_BSIZE - offset;
 			continue;
 		}
 		do {
 			de = (struct bfs_dirent *)(bh->b_data + offset);
 			if (de->ino) {
 				int size = strnlen(de->name, BFS_NAMELEN);
-				if (filldir(dirent, de->name, size, f->f_pos,
+				if (!dir_emit(ctx, de->name, size,
 						le16_to_cpu(de->ino),
-						DT_UNKNOWN) < 0) {
+						DT_UNKNOWN)) {
 					brelse(bh);
-					mutex_unlock(&info->bfs_lock);
 					return 0;
 				}
 			}
 			offset += BFS_DIRENT_SIZE;
-			f->f_pos += BFS_DIRENT_SIZE;
-		} while ((offset < BFS_BSIZE) && (f->f_pos < dir->i_size));
+			ctx->pos += BFS_DIRENT_SIZE;
+		} while ((offset < BFS_BSIZE) && (ctx->pos < dir->i_size));
 		brelse(bh);
 	}
-
-	mutex_unlock(&info->bfs_lock);
-	return 0;	
+	return 0;
 }
  
 const struct file_operations bfs_dir_operations = {
 	.read		= generic_read_dir,
-	.readdir	= bfs_readdir,
+	.iterate	= bfs_readdir,
 	.fsync		= generic_file_fsync,
 	.llseek		= generic_file_llseek,
 };
...	...	@@ -26,58 +26,51 @@
26	26	const unsigned char *name, int namelen,
27	27	struct bfs_dirent **res_dir);
28	28
29		-static int bfs_readdir(struct file f, void dirent, filldir_t filldir)
	29	+static int bfs_readdir(struct file f, struct dir_context ctx)
30	30	{
31	31	struct inode *dir = file_inode(f);
32	32	struct buffer_head *bh;
33	33	struct bfs_dirent *de;
34		- struct bfs_sb_info *info = BFS_SB(dir->i_sb);
35	34	unsigned int offset;
36	35	int block;
37	36
38		- mutex_lock(&info->bfs_lock);
39		-
40		- if (f->f_pos & (BFS_DIRENT_SIZE - 1)) {
	37	+ if (ctx->pos & (BFS_DIRENT_SIZE - 1)) {
41	38	printf("Bad f_pos=%08lx for %s:%08lx\n",
42		- (unsigned long)f->f_pos,
	39	+ (unsigned long)ctx->pos,
43	40	dir->i_sb->s_id, dir->i_ino);
44		- mutex_unlock(&info->bfs_lock);
45		- return -EBADF;
	41	+ return -EINVAL;
46	42	}
47	43
48		- while (f->f_pos < dir->i_size) {
49		- offset = f->f_pos & (BFS_BSIZE - 1);
50		- block = BFS_I(dir)->i_sblock + (f->f_pos >> BFS_BSIZE_BITS);
	44	+ while (ctx->pos < dir->i_size) {
	45	+ offset = ctx->pos & (BFS_BSIZE - 1);
	46	+ block = BFS_I(dir)->i_sblock + (ctx->pos >> BFS_BSIZE_BITS);
51	47	bh = sb_bread(dir->i_sb, block);
52	48	if (!bh) {
53		- f->f_pos += BFS_BSIZE - offset;
	49	+ ctx->pos += BFS_BSIZE - offset;
54	50	continue;
55	51	}
56	52	do {
57	53	de = (struct bfs_dirent *)(bh->b_data + offset);
58	54	if (de->ino) {
59	55	int size = strnlen(de->name, BFS_NAMELEN);
60		- if (filldir(dirent, de->name, size, f->f_pos,
	56	+ if (!dir_emit(ctx, de->name, size,
61	57	le16_to_cpu(de->ino),
62		- DT_UNKNOWN) < 0) {
	58	+ DT_UNKNOWN)) {
63	59	brelse(bh);
64		- mutex_unlock(&info->bfs_lock);
65	60	return 0;
66	61	}
67	62	}
68	63	offset += BFS_DIRENT_SIZE;
69		- f->f_pos += BFS_DIRENT_SIZE;
70		- } while ((offset < BFS_BSIZE) && (f->f_pos < dir->i_size));
	64	+ ctx->pos += BFS_DIRENT_SIZE;
	65	+ } while ((offset < BFS_BSIZE) && (ctx->pos < dir->i_size));
71	66	brelse(bh);
72	67	}
73		-
74		- mutex_unlock(&info->bfs_lock);
75		- return 0;
	68	+ return 0;
76	69	}
77	70
78	71	const struct file_operations bfs_dir_operations = {
79	72	.read = generic_read_dir,
80		- .readdir = bfs_readdir,
	73	+ .iterate = bfs_readdir,
81	74	.fsync = generic_file_fsync,
82	75	.llseek = generic_file_llseek,
83	76	};