From: "Randy.Dunlap" <rddunlap@osdl.org>
To: Jesper Juhl <juhl-lkml@dif.dk>
Cc: reiserfs-dev@namesys.com, reiserfs-list@namesys.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] reiserfs: fix a few 'empty body in an if-statement' warnings.
Date: Thu, 14 Apr 2005 18:49:13 -0700 [thread overview]
Message-ID: <20050414184913.72831860.rddunlap@osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.62.0504150255090.3466@dragon.hyggekrogen.localhost>
On Fri, 15 Apr 2005 02:58:54 +0200 (CEST) Jesper Juhl wrote:
| When building with gcc -W fs/reiserfs/namei.c:602 has a few warnings
| about 'empty body in an if-statement'. This patch silences those warnings.
So fix include/linux/reiserfs_xattr.h:
change
#define reiserfs_mark_inode_private(inode)
to
#define reiserfs_mark_inode_private(inode) do { } while (0)
and not as below.
| Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
|
| --- linux-2.6.12-rc2-mm3-orig/fs/reiserfs/namei.c 2005-04-11 21:20:55.000000000 +0200
| +++ linux-2.6.12-rc2-mm3/fs/reiserfs/namei.c 2005-04-15 02:54:53.000000000 +0200
| @@ -352,8 +352,9 @@ static struct dentry * reiserfs_lookup (
| }
|
| /* Propogate the priv_object flag so we know we're in the priv tree */
| - if (is_reiserfs_priv_object (dir))
| + if (is_reiserfs_priv_object (dir)) {
| reiserfs_mark_inode_private (inode);
| + }
| }
| reiserfs_write_unlock(dir->i_sb);
| if ( retval == IO_ERROR ) {
| @@ -599,8 +600,9 @@ static int reiserfs_create (struct inode
|
| reiserfs_write_lock(dir->i_sb);
|
| - if (locked)
| + if (locked) {
| reiserfs_write_lock_xattrs (dir->i_sb);
| + }
|
| retval = journal_begin(&th, dir->i_sb, jbegin_count);
| if (retval) {
| @@ -640,8 +642,9 @@ static int reiserfs_create (struct inode
| retval = journal_end(&th, dir->i_sb, jbegin_count) ;
|
| out_failed:
| - if (locked)
| + if (locked) {
| reiserfs_write_unlock_xattrs (dir->i_sb);
| + }
| reiserfs_write_unlock(dir->i_sb);
| return retval;
| }
| @@ -668,8 +671,9 @@ static int reiserfs_mknod (struct inode
|
| reiserfs_write_lock(dir->i_sb);
|
| - if (locked)
| + if (locked) {
| reiserfs_write_lock_xattrs (dir->i_sb);
| + }
|
| retval = journal_begin(&th, dir->i_sb, jbegin_count) ;
| if (retval) {
| @@ -714,8 +718,9 @@ static int reiserfs_mknod (struct inode
| retval = journal_end(&th, dir->i_sb, jbegin_count) ;
|
| out_failed:
| - if (locked)
| + if (locked) {
| reiserfs_write_unlock_xattrs (dir->i_sb);
| + }
| reiserfs_write_unlock(dir->i_sb);
| return retval;
| }
| @@ -743,8 +748,9 @@ static int reiserfs_mkdir (struct inode
| locked = reiserfs_cache_default_acl (dir);
|
| reiserfs_write_lock(dir->i_sb);
| - if (locked)
| + if (locked) {
| reiserfs_write_lock_xattrs (dir->i_sb);
| + }
|
| retval = journal_begin(&th, dir->i_sb, jbegin_count) ;
| if (retval) {
| @@ -799,8 +805,9 @@ static int reiserfs_mkdir (struct inode
| d_instantiate(dentry, inode);
| retval = journal_end(&th, dir->i_sb, jbegin_count) ;
| out_failed:
| - if (locked)
| + if (locked) {
| reiserfs_write_unlock_xattrs (dir->i_sb);
| + }
| reiserfs_write_unlock(dir->i_sb);
| return retval;
| }
---
~Randy
next prev parent reply other threads:[~2005-04-15 1:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-15 0:58 Jesper Juhl
2005-04-15 1:49 ` Randy.Dunlap [this message]
2005-04-15 9:44 ` Jesper Juhl
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=20050414184913.72831860.rddunlap@osdl.org \
--to=rddunlap@osdl.org \
--cc=juhl-lkml@dif.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=reiserfs-dev@namesys.com \
--cc=reiserfs-list@namesys.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®