fs/9p: fix readdir()

Al Viro's IOV changes broke 9p readdir() because the new code didn't abort the read when it returned nothing. The original code checked if the combined error/length was <= 0 but in the new code that accidentally got changed to just an error check. Add back the return from the function when nothing is read. Cc: Al Viro <[email protected]> Fixes: e1200fe ("9p: switch p9_client_read() to passing struct iov_iter *") Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Al Viro <[email protected]>
noroot · Apr 24, 2015 · 8e3c500 · 8e3c500
1 parent bb66873
commit 8e3c500
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
@@ -138,6 +138,8 @@ static int v9fs_dir_readdir(struct file *file, struct dir_context *ctx)
 					   &err);
 			if (err)
 				return err;
+			if (n == 0)
+				return 0;
 
 			rdir->head = 0;
 			rdir->tail = n;