Skip to content

Commit

Permalink
fs/: do not fallback to default_llseek() when readdir() uses BKL
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Jan Kara <[email protected]>
Acked-by: Anders Larsen <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
jan Blunck authored and torvalds committed May 27, 2010
1 parent b4d878e commit ca57272
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions fs/autofs/root.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ static int autofs_root_mkdir(struct inode *,struct dentry *,int);
static int autofs_root_ioctl(struct inode *, struct file *,unsigned int,unsigned long);

const struct file_operations autofs_root_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = autofs_root_readdir,
.ioctl = autofs_root_ioctl,
Expand Down
2 changes: 2 additions & 0 deletions fs/freevxfs/vxfs_lookup.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ const struct inode_operations vxfs_dir_inode_ops = {
};

const struct file_operations vxfs_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = vxfs_readdir,
};

Expand Down
1 change: 1 addition & 0 deletions fs/isofs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ static int isofs_readdir(struct file *filp,

const struct file_operations isofs_dir_operations =
{
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = isofs_readdir,
};
Expand Down
1 change: 1 addition & 0 deletions fs/ncpfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ extern int ncp_symlink(struct inode *, struct dentry *, const char *);

const struct file_operations ncp_dir_operations =
{
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = ncp_readdir,
.unlocked_ioctl = ncp_ioctl,
Expand Down
1 change: 1 addition & 0 deletions fs/qnx4/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ static int qnx4_readdir(struct file *filp, void *dirent, filldir_t filldir)

const struct file_operations qnx4_dir_operations =
{
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = qnx4_readdir,
.fsync = simple_fsync,
Expand Down
1 change: 1 addition & 0 deletions fs/reiserfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ static int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry,
int datasync);

const struct file_operations reiserfs_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = reiserfs_readdir,
.fsync = reiserfs_dir_fsync,
Expand Down
1 change: 1 addition & 0 deletions fs/smbfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static int smb_link(struct dentry *, struct inode *, struct dentry *);

const struct file_operations smb_dir_operations =
{
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = smb_readdir,
.unlocked_ioctl = smb_ioctl,
Expand Down
1 change: 1 addition & 0 deletions fs/udf/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ static int udf_readdir(struct file *filp, void *dirent, filldir_t filldir)

/* readdir and lookup functions */
const struct file_operations udf_dir_operations = {
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = udf_readdir,
.unlocked_ioctl = udf_ioctl,
Expand Down

0 comments on commit ca57272

Please sign in to comment.