fs/ntfs: remove unused varibles
PATCH 1/1 fs/ntfs: remove unused varibles
We actually don't use these varibles, so remove them to avoid gcc warning:fs/ntfs/file.c:326:14: warning: variable ‘base_ni’ set but not used [-Wunused-but-set-variable]fs/ntfs/logfile.c:481:21: warning: variable ‘log_page_mask’ set but not used [-Wunused-but-set-variable]
--- fs/ntfs/file.c | 5 +---- fs/ntfs/logfile.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)
fs/ntfs/file.c +1 -4
@@ -323,7 +323,7 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,unsigned long flags;struct file *file = iocb->ki_filp;struct inode *vi =file_inode (file); -ntfs_inode *base_ni, *ni =NTFS_I (vi); +ntfs_inode *ni =NTFS_I (vi);ntfs_volume *vol = ni->vol; ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, pos "
@@ -365,9 +365,6 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb, err = -EOPNOTSUPP ; goto out; } - base_ni = ni; -if (NInoAttr (ni)) - base_ni = ni->ext.base_ntfs_ino; err =file_remove_privs (file);if (unlikely (err)) goto out;
fs/ntfs/logfile.c +1 -2
@@ -478,7 +478,7 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)u8 *kaddr =NULL ;RESTART_PAGE_HEADER *rstr1_ph =NULL ;RESTART_PAGE_HEADER *rstr2_ph =NULL ; -int log_page_size, log_page_mask, err; +int log_page_size, err;bool logfile_is_empty = true;u8 log_page_bits;
@@ -501,7 +501,6 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp) log_page_size = DefaultLogPageSize; else log_page_size =PAGE_SIZE ; - log_page_mask = log_page_size -1 ;/* * Use ntfs_ffs() instead of ffs() to enable the compiler to * optimize log_page_size and log_page_bits into constants.
Signature · 1 line
1.8.3.1
Hi,
Andrew, please can you merge this? Thanks a lot in advance!
Alex, thank you for the patch!
Best regards,
Anton
Quoted 64 lines · Alex Shi
We actually don't use these varibles, so remove them to avoid gcc warning:
fs/ntfs/file.c:326:14: warning: variable ‘base_ni’ set but not used [-Wunused-but-set-variable]fs/ntfs/logfile.c:481:21: warning: variable ‘log_page_mask’ set but not used [-Wunused-but-set-variable]Signed-off-by Alex Shi <[email protected]>---
fs/ntfs/file.c| 5 +----fs/ntfs/logfile.c| 3 +--2 files changed, 2 insertions(+), 6 deletions(-)fs/ntfs/file.c +1
-4@@ -323,7 +323,7 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb,unsigned long flags;struct file *file = iocb->ki_filp;struct inode *vi =file_inode (file); -ntfs_inode *base_ni, *ni =NTFS_I (vi); +ntfs_inode *ni =NTFS_I (vi);ntfs_volume *vol = ni->vol; ntfs_debug("Entering for i_ino 0x%lx, attribute type 0x%x, pos "@@ -365,9 +365,6 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb, err = -EOPNOTSUPP ; goto out; } - base_ni = ni; -if (NInoAttr (ni)) - base_ni = ni->ext.base_ntfs_ino; err =file_remove_privs (file);if (unlikely (err)) goto out;fs/ntfs/logfile.c +1
-2@@ -478,7 +478,7 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp)u8 *kaddr =NULL ;RESTART_PAGE_HEADER *rstr1_ph =NULL ;RESTART_PAGE_HEADER *rstr2_ph =NULL ; -int log_page_size, log_page_mask, err; +int log_page_size, err;bool logfile_is_empty = true;u8 log_page_bits;@@ -501,7 +501,6 @@ bool ntfs_check_logfile(struct inode *log_vi, RESTART_PAGE_HEADER **rp) log_page_size = DefaultLogPageSize; else log_page_size =PAGE_SIZE ; - log_page_mask = log_page_size -1 ;/* * Use ntfs_ffs() instead of ffs() to enable the compiler to * optimize log_page_size and log_page_bits into constants. Signature · 1 line
1.8.3.1
Signature · 3 lines
Anton Altaparmakov <anton at tuxera.com> (replace at with @) Lead in File System Development, Tuxera Inc., http://www.tuxera.com/ Linux NTFS maintainer