diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-22 13:41:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-22 13:41:16 +0300 |
| commit | bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2 (patch) | |
| tree | 45115e9c988cbaa49f3766cbe6e6775757cb8c20 /fs/ntfs3/fslog.c | |
| parent | ab98bbee072c7c30c391ae742b209efebb468273 (diff) | |
| parent | 64222515138e43da1fcf288f0289ef1020427b87 (diff) | |
| download | linux-bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions.
With a build fix from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/ntfs3/fslog.c')
| -rw-r--r-- | fs/ntfs3/fslog.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/ntfs3/fslog.c b/fs/ntfs3/fslog.c index b5853aed0e25..06492f088d60 100644 --- a/fs/ntfs3/fslog.c +++ b/fs/ntfs3/fslog.c @@ -6,12 +6,8 @@ */ #include <linux/blkdev.h> -#include <linux/buffer_head.h> #include <linux/fs.h> -#include <linux/hash.h> -#include <linux/nls.h> #include <linux/random.h> -#include <linux/ratelimit.h> #include <linux/slab.h> #include "debug.h" @@ -2219,7 +2215,7 @@ file_is_valid: err = ntfs_sb_write_run(log->ni->mi.sbi, &log->ni->file.run, off, page, - log->page_size); + log->page_size, 0); if (err) goto out; @@ -3710,7 +3706,7 @@ move_data: if (a_dirty) { attr = oa->attr; - err = ntfs_sb_write_run(sbi, oa->run1, vbo, buffer_le, bytes); + err = ntfs_sb_write_run(sbi, oa->run1, vbo, buffer_le, bytes, 0); if (err) goto out; } @@ -5152,10 +5148,10 @@ end_reply: ntfs_fix_pre_write(&rh->rhdr, log->page_size); - err = ntfs_sb_write_run(sbi, &ni->file.run, 0, rh, log->page_size); + err = ntfs_sb_write_run(sbi, &ni->file.run, 0, rh, log->page_size, 0); if (!err) err = ntfs_sb_write_run(sbi, &log->ni->file.run, log->page_size, - rh, log->page_size); + rh, log->page_size, 0); kfree(rh); if (err) |