summaryrefslogtreecommitdiffstats
path: root/fs/open.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-14 10:06:32 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:12 -0400
commit4597e695b8baa3e2620da89c7593be70cf20566b (patch)
treef8e8cf56e4b154e8bef5e6ae2aa802526ccd1668 /fs/open.c
parentdd20908a8a06b22c171f6c3fcdbdbd65bed07505 (diff)
get rid of DEBUG_WRITECOUNT
it only makes control flow in __fput() and friends more convoluted. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/open.c')
-rw-r--r--fs/open.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/open.c b/fs/open.c
index 2ed7325f713e..8d0b6adfe7b8 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -683,7 +683,6 @@ static int do_dentry_open(struct file *f,
683 error = __get_file_write_access(inode, f->f_path.mnt); 683 error = __get_file_write_access(inode, f->f_path.mnt);
684 if (error) 684 if (error)
685 goto cleanup_file; 685 goto cleanup_file;
686 file_take_write(f);
687 } 686 }
688 687
689 f->f_mapping = inode->i_mapping; 688 f->f_mapping = inode->i_mapping;
@@ -731,14 +730,7 @@ cleanup_all:
731 fops_put(f->f_op); 730 fops_put(f->f_op);
732 if (f->f_mode & FMODE_WRITE) { 731 if (f->f_mode & FMODE_WRITE) {
733 if (!special_file(inode->i_mode)) { 732 if (!special_file(inode->i_mode)) {
734 /*
735 * We don't consider this a real
736 * mnt_want/drop_write() pair
737 * because it all happenend right
738 * here, so just reset the state.
739 */
740 put_write_access(inode); 733 put_write_access(inode);
741 file_reset_write(f);
742 __mnt_drop_write(f->f_path.mnt); 734 __mnt_drop_write(f->f_path.mnt);
743 } 735 }
744 } 736 }