From 034cd83e2444d9d77e1c9ed639e22c4fe9c82400 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 11 Jan 2018 14:18:42 -0500 Subject: [PATCH] add patch fix-incorrect-indentation-of-if-statement --- fix-incorrect-indentation-of-if-statement | 34 +++++++++++++++++++++++++++++++ series | 1 + timestamps | 7 ++++--- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 fix-incorrect-indentation-of-if-statement diff --git a/fix-incorrect-indentation-of-if-statement b/fix-incorrect-indentation-of-if-statement new file mode 100644 index 00000000..2ab8101a --- /dev/null +++ b/fix-incorrect-indentation-of-if-statement @@ -0,0 +1,34 @@ +ext4: fix incorrect indentation of if statement + +From: Colin Ian King + +The indentation is incorrect and spaces need replacing with a tab +on the if statement. + +Cleans up smatch warning: +fs/ext4/namei.c:3220 ext4_link() warn: inconsistent indenting + +Signed-off-by: Colin Ian King +Signed-off-by: Theodore Ts'o +Reviewed-by: Jan Kara +--- + fs/ext4/namei.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c +index e750d68fbcb5..c5696a93a3a6 100644 +--- a/fs/ext4/namei.c ++++ b/fs/ext4/namei.c +@@ -3221,9 +3221,9 @@ static int ext4_link(struct dentry *old_dentry, + if (err) + return err; + +- if ((ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) && +- (!projid_eq(EXT4_I(dir)->i_projid, +- EXT4_I(old_dentry->d_inode)->i_projid))) ++ if ((ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) && ++ (!projid_eq(EXT4_I(dir)->i_projid, ++ EXT4_I(old_dentry->d_inode)->i_projid))) + return -EXDEV; + + err = dquot_initialize(dir); diff --git a/series b/series index dae04b36..e84d44a4 100644 --- a/series +++ b/series @@ -14,6 +14,7 @@ jbd2-fix-sphinx-kernel-doc-build-warnings save-error-to-disk-in-ext4_grp_locked_error use-sbi-instead-of-EXT4_SB correct-documentation-for-grpid-mount-option +fix-incorrect-indentation-of-if-statement #################################################### # unstable patches diff --git a/timestamps b/timestamps index 5b6152e6..f0137a9e 100755 --- a/timestamps +++ b/timestamps @@ -47,6 +47,7 @@ touch -d @1515562049 jbd2-fix-sphinx-kernel-doc-build-warnings touch -d @1515562459 save-error-to-disk-in-ext4_grp_locked_error touch -d @1515694669 use-sbi-instead-of-EXT4_SB touch -d @1515696213 correct-documentation-for-grpid-mount-option -touch -d @1515696640 series -touch -d @1515696645 status -touch -d @1515696904 timestamps +touch -d @1515698199 series +touch -d @1515698250 fix-incorrect-indentation-of-if-statement +touch -d @1515698251 status +touch -d @1515698314 timestamps -- 2.11.4.GIT