Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e367626b6164aeecb97fb7c20509ed8696babc26

Authored by Jan Kara
1 parent a2a735ad66
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ext3: Remove syncing logic from ext3_file_write 

Syncing is now properly done by generic_file_aio_write() so no special logic is
needed in ext3.

CC: linux-ext4@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>

Showing 1 changed file with 1 additions and 60 deletions Inline Diff

1 /* 1 /*
2 * linux/fs/ext3/file.c 2 * linux/fs/ext3/file.c
3 * 3 *
4 * Copyright (C) 1992, 1993, 1994, 1995 4 * Copyright (C) 1992, 1993, 1994, 1995
5 * Remy Card (card@masi.ibp.fr) 5 * Remy Card (card@masi.ibp.fr)
6 * Laboratoire MASI - Institut Blaise Pascal 6 * Laboratoire MASI - Institut Blaise Pascal
7 * Universite Pierre et Marie Curie (Paris VI) 7 * Universite Pierre et Marie Curie (Paris VI)
8 * 8 *
9 * from 9 * from
10 * 10 *
11 * linux/fs/minix/file.c 11 * linux/fs/minix/file.c
12 * 12 *
13 * Copyright (C) 1991, 1992 Linus Torvalds 13 * Copyright (C) 1991, 1992 Linus Torvalds
14 * 14 *
15 * ext3 fs regular file handling primitives 15 * ext3 fs regular file handling primitives
16 * 16 *
17 * 64-bit file support on 64-bit platforms by Jakub Jelinek 17 * 64-bit file support on 64-bit platforms by Jakub Jelinek
18 * (jj@sunsite.ms.mff.cuni.cz) 18 * (jj@sunsite.ms.mff.cuni.cz)
19 */ 19 */
20 20
21 #include <linux/time.h> 21 #include <linux/time.h>
22 #include <linux/fs.h> 22 #include <linux/fs.h>
23 #include <linux/jbd.h> 23 #include <linux/jbd.h>
24 #include <linux/ext3_fs.h> 24 #include <linux/ext3_fs.h>
25 #include <linux/ext3_jbd.h> 25 #include <linux/ext3_jbd.h>
26 #include "xattr.h" 26 #include "xattr.h"
27 #include "acl.h" 27 #include "acl.h"
28 28
29 /* 29 /*
30 * Called when an inode is released. Note that this is different 30 * Called when an inode is released. Note that this is different
31 * from ext3_file_open: open gets called at every open, but release 31 * from ext3_file_open: open gets called at every open, but release
32 * gets called only when /all/ the files are closed. 32 * gets called only when /all/ the files are closed.
33 */ 33 */
34 static int ext3_release_file (struct inode * inode, struct file * filp) 34 static int ext3_release_file (struct inode * inode, struct file * filp)
35 { 35 {
36 if (EXT3_I(inode)->i_state & EXT3_STATE_FLUSH_ON_CLOSE) { 36 if (EXT3_I(inode)->i_state & EXT3_STATE_FLUSH_ON_CLOSE) {
37 filemap_flush(inode->i_mapping); 37 filemap_flush(inode->i_mapping);
38 EXT3_I(inode)->i_state &= ~EXT3_STATE_FLUSH_ON_CLOSE; 38 EXT3_I(inode)->i_state &= ~EXT3_STATE_FLUSH_ON_CLOSE;
39 } 39 }
40 /* if we are the last writer on the inode, drop the block reservation */ 40 /* if we are the last writer on the inode, drop the block reservation */
41 if ((filp->f_mode & FMODE_WRITE) && 41 if ((filp->f_mode & FMODE_WRITE) &&
42 (atomic_read(&inode->i_writecount) == 1)) 42 (atomic_read(&inode->i_writecount) == 1))
43 { 43 {
44 mutex_lock(&EXT3_I(inode)->truncate_mutex); 44 mutex_lock(&EXT3_I(inode)->truncate_mutex);
45 ext3_discard_reservation(inode); 45 ext3_discard_reservation(inode);
46 mutex_unlock(&EXT3_I(inode)->truncate_mutex); 46 mutex_unlock(&EXT3_I(inode)->truncate_mutex);
47 } 47 }
48 if (is_dx(inode) && filp->private_data) 48 if (is_dx(inode) && filp->private_data)
49 ext3_htree_free_dir_info(filp->private_data); 49 ext3_htree_free_dir_info(filp->private_data);
50 50
51 return 0; 51 return 0;
52 } 52 }
53 53
54 static ssize_t
55 ext3_file_write(struct kiocb *iocb, const struct iovec *iov,
56 unsigned long nr_segs, loff_t pos)
57 {
58 struct file *file = iocb->ki_filp;
59 struct inode *inode = file->f_path.dentry->d_inode;
60 ssize_t ret;
61 int err;
62
63 ret = generic_file_aio_write(iocb, iov, nr_segs, pos);
64
65 /*
66 * Skip flushing if there was an error, or if nothing was written.
67 */
68 if (ret <= 0)
69 return ret;
70
71 /*
72 * If the inode is IS_SYNC, or is O_SYNC and we are doing data
73 * journalling then we need to make sure that we force the transaction
74 * to disk to keep all metadata uptodate synchronously.
75 */
76 if (file->f_flags & O_SYNC) {
77 /*
78 * If we are non-data-journaled, then the dirty data has
79 * already been flushed to backing store by generic_osync_inode,
80 * and the inode has been flushed too if there have been any
81 * modifications other than mere timestamp updates.
82 *
83 * Open question --- do we care about flushing timestamps too
84 * if the inode is IS_SYNC?
85 */
86 if (!ext3_should_journal_data(inode))
87 return ret;
88
89 goto force_commit;
90 }
91
92 /*
93 * So we know that there has been no forced data flush. If the inode
94 * is marked IS_SYNC, we need to force one ourselves.
95 */
96 if (!IS_SYNC(inode))
97 return ret;
98
99 /*
100 * Open question #2 --- should we force data to disk here too? If we
101 * don't, the only impact is that data=writeback filesystems won't
102 * flush data to disk automatically on IS_SYNC, only metadata (but
103 * historically, that is what ext2 has done.)
104 */
105
106 force_commit:
107 err = ext3_force_commit(inode->i_sb);
108 if (err)
109 return err;
110 return ret;
111 }
112
113 const struct file_operations ext3_file_operations = { 54 const struct file_operations ext3_file_operations = {
114 .llseek = generic_file_llseek, 55 .llseek = generic_file_llseek,
115 .read = do_sync_read, 56 .read = do_sync_read,
116 .write = do_sync_write, 57 .write = do_sync_write,
117 .aio_read = generic_file_aio_read, 58 .aio_read = generic_file_aio_read,
118 .aio_write = ext3_file_write, 59 .aio_write = generic_file_aio_write,
119 .unlocked_ioctl = ext3_ioctl, 60 .unlocked_ioctl = ext3_ioctl,
120 #ifdef CONFIG_COMPAT 61 #ifdef CONFIG_COMPAT
121 .compat_ioctl = ext3_compat_ioctl, 62 .compat_ioctl = ext3_compat_ioctl,
122 #endif 63 #endif
123 .mmap = generic_file_mmap, 64 .mmap = generic_file_mmap,
124 .open = generic_file_open, 65 .open = generic_file_open,
125 .release = ext3_release_file, 66 .release = ext3_release_file,
126 .fsync = ext3_sync_file, 67 .fsync = ext3_sync_file,
127 .splice_read = generic_file_splice_read, 68 .splice_read = generic_file_splice_read,
128 .splice_write = generic_file_splice_write, 69 .splice_write = generic_file_splice_write,
129 }; 70 };
130 71
131 const struct inode_operations ext3_file_inode_operations = { 72 const struct inode_operations ext3_file_inode_operations = {
132 .truncate = ext3_truncate, 73 .truncate = ext3_truncate,
133 .setattr = ext3_setattr, 74 .setattr = ext3_setattr,
134 #ifdef CONFIG_EXT3_FS_XATTR 75 #ifdef CONFIG_EXT3_FS_XATTR
135 .setxattr = generic_setxattr, 76 .setxattr = generic_setxattr,
136 .getxattr = generic_getxattr, 77 .getxattr = generic_getxattr,
137 .listxattr = ext3_listxattr, 78 .listxattr = ext3_listxattr,
138 .removexattr = generic_removexattr, 79 .removexattr = generic_removexattr,
139 #endif 80 #endif
140 .check_acl = ext3_check_acl, 81 .check_acl = ext3_check_acl,
141 .fiemap = ext3_fiemap, 82 .fiemap = ext3_fiemap,
142 }; 83 };
143 84
144 85