Skip to content

Commit

Permalink
[PATCH] fix ->llseek for more directories
Browse files Browse the repository at this point in the history
With this patch all directory fops instances that have a readdir
that doesn't take the BKL are switched to generic_file_llseek.

Signed-off-by: Christoph Hellwig <[email protected]>
  • Loading branch information
Christoph Hellwig authored and Al Viro committed Oct 23, 2008
1 parent 4e9ed2f commit 3222a3e
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions fs/afs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const struct file_operations afs_dir_file_operations = {
.release = afs_release,
.readdir = afs_readdir,
.lock = afs_lock,
.llseek = generic_file_llseek,
};

const struct inode_operations afs_dir_inode_operations = {
Expand Down
1 change: 1 addition & 0 deletions fs/bfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const struct file_operations bfs_dir_operations = {
.read = generic_read_dir,
.readdir = bfs_readdir,
.fsync = file_fsync,
.llseek = generic_file_llseek,
};

extern void dump_imap(const char *, struct super_block *);
Expand Down
1 change: 1 addition & 0 deletions fs/cifs/cifsfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,7 @@ const struct file_operations cifs_dir_ops = {
.dir_notify = cifs_dir_notify,
#endif /* CONFIG_CIFS_EXPERIMENTAL */
.unlocked_ioctl = cifs_ioctl,
.llseek = generic_file_llseek,
};

static void
Expand Down
1 change: 1 addition & 0 deletions fs/fat/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,7 @@ const struct file_operations fat_dir_operations = {
.compat_ioctl = fat_compat_dir_ioctl,
#endif
.fsync = file_fsync,
.llseek = generic_file_llseek,
};

static int fat_get_short_entry(struct inode *dir, loff_t *pos,
Expand Down
3 changes: 2 additions & 1 deletion fs/jffs2/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ const struct file_operations jffs2_dir_operations =
.read = generic_read_dir,
.readdir = jffs2_readdir,
.unlocked_ioctl=jffs2_ioctl,
.fsync = jffs2_fsync
.fsync = jffs2_fsync,
.llseek = generic_file_llseek,
};


Expand Down
1 change: 1 addition & 0 deletions fs/jfs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1547,6 +1547,7 @@ const struct file_operations jfs_dir_operations = {
#ifdef CONFIG_COMPAT
.compat_ioctl = jfs_compat_ioctl,
#endif
.llseek = generic_file_llseek,
};

static int jfs_ci_hash(struct dentry *dir, struct qstr *this)
Expand Down
1 change: 1 addition & 0 deletions fs/omfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,4 +501,5 @@ struct inode_operations omfs_dir_inops = {
struct file_operations omfs_dir_operations = {
.read = generic_read_dir,
.readdir = omfs_readdir,
.llseek = generic_file_llseek,
};
1 change: 1 addition & 0 deletions fs/openpromfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ static int openpromfs_readdir(struct file *, void *, filldir_t);
static const struct file_operations openprom_operations = {
.read = generic_read_dir,
.readdir = openpromfs_readdir,
.llseek = generic_file_llseek,
};

static struct dentry *openpromfs_lookup(struct inode *, struct dentry *, struct nameidata *);
Expand Down
1 change: 1 addition & 0 deletions fs/proc/proc_sysctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ static const struct file_operations proc_sys_file_operations = {

static const struct file_operations proc_sys_dir_file_operations = {
.readdir = proc_sys_readdir,
.llseek = generic_file_llseek,
};

static const struct inode_operations proc_sys_inode_operations = {
Expand Down
1 change: 1 addition & 0 deletions fs/sysfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -983,4 +983,5 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
const struct file_operations sysfs_dir_operations = {
.read = generic_read_dir,
.readdir = sysfs_readdir,
.llseek = generic_file_llseek,
};
1 change: 1 addition & 0 deletions fs/ufs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,4 +667,5 @@ const struct file_operations ufs_dir_operations = {
.read = generic_read_dir,
.readdir = ufs_readdir,
.fsync = file_fsync,
.llseek = generic_file_llseek,
};

0 comments on commit 3222a3e

Please sign in to comment.