diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-28 15:41:38 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-08 08:36:58 +0200 |
commit | 6ddc8ca036d002ed95e13609aaeb57600d9199b5 (patch) | |
tree | 5491eaad828a1fa4baf75aed08a8a17ca173d546 /fs/ubifs/ubifs.c | |
parent | e8909590f73932f944d92ab6f23cd4d32ed0c838 (diff) | |
download | barebox-6ddc8ca036d002ed95e13609aaeb57600d9199b5.tar.gz barebox-6ddc8ca036d002ed95e13609aaeb57600d9199b5.tar.xz |
ubifs: Update to v4.18-rc6
This syncs the UBIFS code with Linux-4.19-rc6.
There are many functions in the Linux UBIFS codebase that we do not need
for a readonly implementation. These are missing here, but all removed
functions are annotated as such so it should be relatively easy to copy
a newer codebase over the current one and to see which functions shall
be removed from the newer version.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/ubifs/ubifs.c')
-rw-r--r-- | fs/ubifs/ubifs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 99612732dd..11fb3187ad 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -23,6 +23,8 @@ #include <linux/err.h> +struct task_struct *current; + struct ubifs_priv { struct cdev *cdev; struct ubi_volume_desc *ubi; @@ -262,7 +264,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block, return err; } - ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum); + ubifs_assert(c, le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum); len = le32_to_cpu(dn->size); if (len <= 0 || len > UBIFS_BLOCK_SIZE) |