Whamcloud - gitweb
LU-14195 ldiskfs: update patches for Linux 5.10
[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / linux-5.10 / ext4-attach-jinode-in-writepages.patch
1 From 01da8ce642e08594db95d940b3352ad7ee153b09 Mon Sep 17 00:00:00 2001
2 From: Shaun Tancheff <stancheff@cray.com>
3 Date: Tue, 6 Aug 2019 17:11:57 -0500
4 Subject: [PATCH] + linux-5.3/ext4-attach-jinode-in-writepages
5
6 ---
7  fs/ext4/ext4.h  |    1 +
8  fs/ext4/inode.c |    8 ++++++++
9  2 files changed, 9 insertions(+)
10
11 --- a/fs/ext4/ext4.h
12 +++ b/fs/ext4/ext4.h
13 @@ -2972,6 +2972,7 @@ extern void ext4_mb_mark_bb(struct super
14                        int len, int state);
15  
16  /* inode.c */
17 +#define HAVE_LDISKFS_INFO_JINODE
18  void ext4_inode_csum_set(struct inode *inode, struct ext4_inode *raw,
19                          struct ext4_inode_info *ei);
20  int ext4_inode_is_fast_symlink(struct inode *inode);
21 --- a/fs/ext4/inode.c
22 +++ b/fs/ext4/inode.c
23 @@ -723,6 +723,10 @@ out_sem:
24                                 (loff_t)map->m_lblk << inode->i_blkbits;
25                         loff_t length = (loff_t)map->m_len << inode->i_blkbits;
26  
27 +                       ret = ext4_inode_attach_jinode(inode);
28 +                       if (ret)
29 +                               return ret;
30 +
31                         if (flags & EXT4_GET_BLOCKS_IO_SUBMIT)
32                                 ret = ext4_jbd2_inode_add_wait(handle, inode,
33                                                 start_byte, length);
34 @@ -2725,6 +2729,9 @@ static int ext4_writepages(struct addres
35                 mpd.last_page = wbc->range_end >> PAGE_SHIFT;
36         }
37  
38 +       ret = ext4_inode_attach_jinode(inode);
39 +       if (ret)
40 +               goto out_writepages;
41         mpd.inode = inode;
42         mpd.wbc = wbc;
43         ext4_io_submit_init(&mpd.io_submit, wbc);
44 @@ -4156,6 +4163,7 @@ int ext4_inode_attach_jinode(struct inod
45                 jbd2_free_inode(jinode);
46         return 0;
47  }
48 +EXPORT_SYMBOL(ext4_inode_attach_jinode);
49  
50  /*
51   * ext4_truncate()