Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-04-22 15:23:53 +0200
committerJiri Kosina <jkosina@suse.cz>2013-04-22 15:34:08 +0200
commit5174afe2f9142d604bf27d8e5e41d5c35f789643 (patch)
tree54c92ec147a6f787a580311d2de61b7dd23c534f
parent13432a0b5cc5a9710da981bc93ac6cbd9f4a9d82 (diff)
[PATCH 3.0-stable] Revert "sysfs: fix race between readdirrpm-3.0.74-0.9
-rw-r--r--fs/sysfs/dir.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
index 97720e174683..52327a5eb455 100644
--- a/fs/sysfs/dir.c
+++ b/fs/sysfs/dir.c
@@ -965,21 +965,9 @@ static int sysfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
return 0;
}
-static loff_t sysfs_dir_llseek(struct file *file, loff_t offset, int whence)
-{
- struct inode *inode = file->f_path.dentry->d_inode;
- loff_t ret;
-
- mutex_lock(&inode->i_mutex);
- ret = generic_file_llseek(file, offset, whence);
- mutex_unlock(&inode->i_mutex);
-
- return ret;
-}
-
const struct file_operations sysfs_dir_operations = {
.read = generic_read_dir,
.readdir = sysfs_readdir,
.release = sysfs_dir_release,
- .llseek = sysfs_dir_llseek,
+ .llseek = generic_file_llseek,
};