ca572727db
Do not use the fallback default_llseek() if the readdir operation of the filesystem still uses the big kernel lock. Since llseek() modifies file->f_pos of the directory directly it may need locking to not confuse readdir which usually uses file->f_pos directly as well Since the special characteristics of the BKL (unlocked on schedule) are not necessary in this case, the inode mutex can be used for locking as provided by generic_file_llseek(). This is only possible since all filesystems, except reiserfs, either use a directory as a flat file or with disk address offsets. Reiserfs on the other hand uses a 32bit hash off the filename as the offset so generic_file_llseek() can get used as well since the hash is always smaller than sb->s_maxbytes (= (512 << 32) - blocksize). Signed-off-by: Jan Blunck <jblunck@suse.de> Acked-by: Jan Kara <jack@suse.cz> Acked-by: Anders Larsen <al@alarsen.net> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
90 lines
2.3 KiB
C
90 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/smp_lock.h>
|
|
#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));
|
|
|
|
lock_kernel();
|
|
|
|
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:
|
|
unlock_kernel();
|
|
return 0;
|
|
}
|
|
|
|
const struct file_operations qnx4_dir_operations =
|
|
{
|
|
.llseek = generic_file_llseek,
|
|
.read = generic_read_dir,
|
|
.readdir = qnx4_readdir,
|
|
.fsync = simple_fsync,
|
|
};
|
|
|
|
const struct inode_operations qnx4_dir_inode_operations =
|
|
{
|
|
.lookup = qnx4_lookup,
|
|
};
|