summaryrefslogtreecommitdiffstats
path: root/fs/ntfs3
diff options
context:
space:
mode:
authorMatthew Wilcox (Oracle) <willy@infradead.org>2022-05-08 14:40:32 -0400
committerMatthew Wilcox (Oracle) <willy@infradead.org>2022-05-08 14:40:32 -0400
commit652118b8c979e7f21358016b5568aac4b25c64d9 (patch)
treedc939c9a086152b319a016075fa94244e36a40bc /fs/ntfs3
parent44ab23b9b3c7a73c738b37a8f5f84adb7d66c267 (diff)
downloadlinux-stable-652118b8c979e7f21358016b5568aac4b25c64d9.tar.gz
linux-stable-652118b8c979e7f21358016b5568aac4b25c64d9.tar.bz2
linux-stable-652118b8c979e7f21358016b5568aac4b25c64d9.zip
ntfs3: Remove fsdata parameter from ntfs_extend_initialized_size()
After the last patch, Smatch reports: fs/ntfs3/file.c:168 ntfs_extend_initialized_size() error: uninitialized symbol 'fsdata'. fsdata is indeed unused. This is not new, but Smatch couldn't see it before because calls through pagecache_write_begin()/pagecache_write_end() could theoretically call any implemention of ->write_begin/write_end, some of which do use fsdata. Now that the calls are direct, Smatch can see they're never used. Fix this by simply passing NULL. While ntfs3 does pass this parameter on to generic functions, those generic functions also never dereference the fsdata parameter, so it's unnecessary to pass the address of a real pointer. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Diffstat (limited to 'fs/ntfs3')
-rw-r--r--fs/ntfs3/file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index c2e7e561958a..e61f335c9c63 100644
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -115,7 +115,6 @@ static int ntfs_extend_initialized_size(struct file *file,
for (;;) {
u32 zerofrom, len;
struct page *page;
- void *fsdata;
u8 bits;
CLST vcn, lcn, clen;
@@ -157,15 +156,14 @@ static int ntfs_extend_initialized_size(struct file *file,
if (pos + len > new_valid)
len = new_valid - pos;
- err = ntfs_write_begin(file, mapping, pos, len, &page, &fsdata);
+ err = ntfs_write_begin(file, mapping, pos, len, &page, NULL);
if (err)
goto out;
zero_user_segment(page, zerofrom, PAGE_SIZE);
/* This function in any case puts page. */
- err = ntfs_write_end(file, mapping, pos, len, len, page,
- fsdata);
+ err = ntfs_write_end(file, mapping, pos, len, len, page, NULL);
if (err < 0)
goto out;
pos += len;