summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-02-23 17:36:01 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-26 02:46:11 -0500
commit21d206819a6f111c77f0a9e920f5efca06dc65fd (patch)
tree564951cdf932d4fc6790ee3fefbc206517650517
parent0e9b10a90f1c30f25dd6f130130240745ab14010 (diff)
get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/anon_inodes.c2
-rw-r--r--fs/open.c1
-rw-r--r--net/socket.c1
3 files changed, 0 insertions, 4 deletions
diff --git a/fs/anon_inodes.c b/fs/anon_inodes.c
index a14eb0c1cd8c..47a65df8c871 100644
--- a/fs/anon_inodes.c
+++ b/fs/anon_inodes.c
@@ -164,9 +164,7 @@ struct file *anon_inode_getfile(const char *name,
goto err_dput;
file->f_mapping = anon_inode_inode->i_mapping;
- file->f_pos = 0;
file->f_flags = flags & (O_ACCMODE | O_NONBLOCK);
- file->f_version = 0;
file->private_data = priv;
return file;
diff --git a/fs/open.c b/fs/open.c
index 97a237f67b72..62f907e3bc36 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -699,7 +699,6 @@ static int do_dentry_open(struct file *f,
}
f->f_mapping = inode->i_mapping;
- f->f_pos = 0;
file_sb_list_add(f, inode->i_sb);
if (unlikely(f->f_mode & FMODE_PATH)) {
diff --git a/net/socket.c b/net/socket.c
index f4a8c5a0b8d7..b6ca6896dec6 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -379,7 +379,6 @@ struct file *sock_alloc_file(struct socket *sock, int flags, const char *dname)
sock->file = file;
file->f_flags = O_RDWR | (flags & O_NONBLOCK);
- file->f_pos = 0;
file->private_data = sock;
return file;
}