From: Dan Carpenter <error27@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Yan Zheng <zheng.yan@oracle.com>, Josef Bacik <josef@redhat.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Chris Mason <chris.mason@oracle.com>,
kernel-janitors@vger.kernel.org
Subject: [patch 5/11] btrfs: remove unneeded null check in btrfs_rename()
Date: Sat, 29 May 2010 11:45:08 +0200 [thread overview]
Message-ID: <20100529094508.GF5483@bicker> (raw)
"old_inode" cannot be null here, because we dereference it
unconditionally throughout the function.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index fa6ccc1..0bc29be 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6487,10 +6487,8 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
* make sure the inode gets flushed if it is replacing
* something.
*/
- if (new_inode && new_inode->i_size &&
- old_inode && S_ISREG(old_inode->i_mode)) {
+ if (new_inode && new_inode->i_size && S_ISREG(old_inode->i_mode))
btrfs_add_ordered_operation(trans, root, old_inode);
- }
old_dir->i_ctime = old_dir->i_mtime = ctime;
new_dir->i_ctime = new_dir->i_mtime = ctime;
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Yan Zheng <zheng.yan@oracle.com>, Josef Bacik <josef@redhat.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Chris Mason <chris.mason@oracle.com>,
kernel-janitors@vger.kernel.org
Subject: [patch 5/11] btrfs: remove unneeded null check in btrfs_rename()
Date: Sat, 29 May 2010 09:45:08 +0000 [thread overview]
Message-ID: <20100529094508.GF5483@bicker> (raw)
"old_inode" cannot be null here, because we dereference it
unconditionally throughout the function.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index fa6ccc1..0bc29be 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6487,10 +6487,8 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
* make sure the inode gets flushed if it is replacing
* something.
*/
- if (new_inode && new_inode->i_size &&
- old_inode && S_ISREG(old_inode->i_mode)) {
+ if (new_inode && new_inode->i_size && S_ISREG(old_inode->i_mode))
btrfs_add_ordered_operation(trans, root, old_inode);
- }
old_dir->i_ctime = old_dir->i_mtime = ctime;
new_dir->i_ctime = new_dir->i_mtime = ctime;
next reply other threads:[~2010-05-29 9:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-29 9:45 Dan Carpenter [this message]
2010-05-29 9:45 ` [patch 5/11] btrfs: remove unneeded null check in btrfs_rename() Dan Carpenter
2010-05-29 18:01 ` Mike Fedyk
2010-05-29 18:01 ` Mike Fedyk
2010-05-29 19:26 ` Al Viro
2010-05-29 19:26 ` Al Viro
2010-05-31 7:25 ` Dan Carpenter
2010-05-31 7:25 ` [patch 5/11] btrfs: remove unneeded null check in Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100529094508.GF5483@bicker \
--to=error27@gmail.com \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=zheng.yan@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.