073c214162
All uses of the BKL in qnx4 were the result of a pushdown into code that doesn't really need it. As Christoph points out, this is a read-only file system, which eliminates most of the races in readdir/lookup. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Anders Larsen <al@alarsen.net> Cc: Christoph Hellwig <hch@infradead.org>
85 lines
2.3 KiB
C
85 lines
2.3 KiB
C
/*
|
|
* QNX4 file system, Linux implementation.
|
|
*
|
|
* Version : 0.2.1
|
|
*
|
|
* Using parts of the xiafs filesystem.
|
|
*
|
|
* History :
|
|
*
|
|
* 28-05-1998 by Richard Frowijn : first release.
|
|
* 20-06-1998 by Frank Denis : Linux 2.1.99+ & dcache support.
|
|
*/
|
|
|
|
#include <linux/buffer_head.h>
|
|
#include "qnx4.h"
|
|
|
|
static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)
|
|
{
|
|
struct inode *inode = filp->f_path.dentry->d_inode;
|
|
unsigned int offset;
|
|
struct buffer_head *bh;
|
|
struct qnx4_inode_entry *de;
|
|
struct qnx4_link_info *le;
|
|
unsigned long blknum;
|
|
int ix, ino;
|
|
int size;
|
|
|
|
QNX4DEBUG((KERN_INFO "qnx4_readdir:i_size = %ld\n", (long) inode->i_size));
|
|
QNX4DEBUG((KERN_INFO "filp->f_pos = %ld\n", (long) filp->f_pos));
|
|
|
|
while (filp->f_pos < inode->i_size) {
|
|
blknum = qnx4_block_map( inode, filp->f_pos >> QNX4_BLOCK_SIZE_BITS );
|
|
bh = sb_bread(inode->i_sb, blknum);
|
|
if(bh==NULL) {
|
|
printk(KERN_ERR "qnx4_readdir: bread failed (%ld)\n", blknum);
|
|
break;
|
|
}
|
|
ix = (int)(filp->f_pos >> QNX4_DIR_ENTRY_SIZE_BITS) % QNX4_INODES_PER_BLOCK;
|
|
while (ix < QNX4_INODES_PER_BLOCK) {
|
|
offset = ix * QNX4_DIR_ENTRY_SIZE;
|
|
de = (struct qnx4_inode_entry *) (bh->b_data + offset);
|
|
size = strlen(de->di_fname);
|
|
if (size) {
|
|
if ( !( de->di_status & QNX4_FILE_LINK ) && size > QNX4_SHORT_NAME_MAX )
|
|
size = QNX4_SHORT_NAME_MAX;
|
|
else if ( size > QNX4_NAME_MAX )
|
|
size = QNX4_NAME_MAX;
|
|
|
|
if ( ( de->di_status & (QNX4_FILE_USED|QNX4_FILE_LINK) ) != 0 ) {
|
|
QNX4DEBUG((KERN_INFO "qnx4_readdir:%.*s\n", size, de->di_fname));
|
|
if ( ( de->di_status & QNX4_FILE_LINK ) == 0 )
|
|
ino = blknum * QNX4_INODES_PER_BLOCK + ix - 1;
|
|
else {
|
|
le = (struct qnx4_link_info*)de;
|
|
ino = ( le32_to_cpu(le->dl_inode_blk) - 1 ) *
|
|
QNX4_INODES_PER_BLOCK +
|
|
le->dl_inode_ndx;
|
|
}
|
|
if (filldir(dirent, de->di_fname, size, filp->f_pos, ino, DT_UNKNOWN) < 0) {
|
|
brelse(bh);
|
|
goto out;
|
|
}
|
|
}
|
|
}
|
|
ix++;
|
|
filp->f_pos += QNX4_DIR_ENTRY_SIZE;
|
|
}
|
|
brelse(bh);
|
|
}
|
|
out:
|
|
return 0;
|
|
}
|
|
|
|
const struct file_operations qnx4_dir_operations =
|
|
{
|
|
.llseek = generic_file_llseek,
|
|
.read = generic_read_dir,
|
|
.readdir = qnx4_readdir,
|
|
.fsync = generic_file_fsync,
|
|
};
|
|
|
|
const struct inode_operations qnx4_dir_inode_operations =
|
|
{
|
|
.lookup = qnx4_lookup,
|
|
};
|