From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org-S261699AbVDOA7a@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S261699AbVDOA7a (ORCPT <rfc822;willy@w.ods.org>);
	Thu, 14 Apr 2005 20:59:30 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261692AbVDOA54
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Thu, 14 Apr 2005 20:57:56 -0400
Received: from mail.dif.dk ([193.138.115.101]:27781 "EHLO saerimmer.dif.dk")
	by vger.kernel.org with ESMTP id S261689AbVDOA4J (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 14 Apr 2005 20:56:09 -0400
Date: Fri, 15 Apr 2005 02:58:54 +0200 (CEST)
From: Jesper Juhl <juhl-lkml@dif.dk>
To: reiserfs-dev@namesys.com
Cc: reiserfs-list@namesys.com, linux-kernel@vger.kernel.org
Subject: [PATCH] reiserfs: fix a few  'empty body in an if-statement' 
 warnings.
Message-ID: <Pine.LNX.4.62.0504150255090.3466@dragon.hyggekrogen.localhost>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

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.

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;
 }