diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-23 17:36:01 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-26 02:46:11 -0500 |
commit | 21d206819a6f111c77f0a9e920f5efca06dc65fd (patch) | |
tree | 564951cdf932d4fc6790ee3fefbc206517650517 | |
parent | 0e9b10a90f1c30f25dd6f130130240745ab14010 (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.c | 2 | ||||
-rw-r--r-- | fs/open.c | 1 | ||||
-rw-r--r-- | net/socket.c | 1 |
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, | |||
164 | goto err_dput; | 164 | goto err_dput; |
165 | file->f_mapping = anon_inode_inode->i_mapping; | 165 | file->f_mapping = anon_inode_inode->i_mapping; |
166 | 166 | ||
167 | file->f_pos = 0; | ||
168 | file->f_flags = flags & (O_ACCMODE | O_NONBLOCK); | 167 | file->f_flags = flags & (O_ACCMODE | O_NONBLOCK); |
169 | file->f_version = 0; | ||
170 | file->private_data = priv; | 168 | file->private_data = priv; |
171 | 169 | ||
172 | return file; | 170 | return file; |
@@ -699,7 +699,6 @@ static int do_dentry_open(struct file *f, | |||
699 | } | 699 | } |
700 | 700 | ||
701 | f->f_mapping = inode->i_mapping; | 701 | f->f_mapping = inode->i_mapping; |
702 | f->f_pos = 0; | ||
703 | file_sb_list_add(f, inode->i_sb); | 702 | file_sb_list_add(f, inode->i_sb); |
704 | 703 | ||
705 | if (unlikely(f->f_mode & FMODE_PATH)) { | 704 | 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) | |||
379 | 379 | ||
380 | sock->file = file; | 380 | sock->file = file; |
381 | file->f_flags = O_RDWR | (flags & O_NONBLOCK); | 381 | file->f_flags = O_RDWR | (flags & O_NONBLOCK); |
382 | file->f_pos = 0; | ||
383 | file->private_data = sock; | 382 | file->private_data = sock; |
384 | return file; | 383 | return file; |
385 | } | 384 | } |