From: Erez Zadok <ezk@cs.sunysb.edu>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
viro@ftp.linux.org.uk, hch@infradead.org,
Erez Zadok <ezk@cs.sunysb.edu>
Subject: [PATCH 04/16] Unionfs: minor cleanup in the debugging infrastructure
Date: Mon, 26 Nov 2007 11:44:01 -0500 [thread overview]
Message-ID: <11960954541631-git-send-email-ezk@cs.sunysb.edu> (raw)
In-Reply-To: <11960954531503-git-send-email-ezk@cs.sunysb.edu>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---
fs/unionfs/debug.c | 64 ++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index bc221d6..c2b8b58 100644
--- a/fs/unionfs/debug.c
+++ b/fs/unionfs/debug.c
@@ -97,24 +97,22 @@ void __unionfs_check_inode(const struct inode *inode,
"istart/end=%d:%d\n", inode,
lower_inode, bindex, istart, iend);
}
- } else { /* lower_inode == NULL */
- if (bindex >= istart && bindex <= iend) {
- /*
- * directories can have NULL lower inodes in
- * b/t start/end, but NOT if at the
- * start/end range.
- */
- if (unlikely(!(S_ISDIR(inode->i_mode) &&
- bindex > istart &&
- bindex < iend))) {
- PRINT_CALLER(fname, fxn, line);
- pr_debug(" Ci7: inode/linode=%p:%p "
- "bindex=%d istart/end=%d:%d\n",
- inode, lower_inode, bindex,
- istart, iend);
- }
- }
+ continue;
}
+ /* if we get here, then lower_inode == NULL */
+ if (bindex < istart || bindex > iend)
+ continue;
+ /*
+ * directories can have NULL lower inodes in b/t start/end,
+ * but NOT if at the start/end range.
+ */
+ if (unlikely(S_ISDIR(inode->i_mode) &&
+ bindex > istart && bindex < iend))
+ continue;
+ PRINT_CALLER(fname, fxn, line);
+ pr_debug(" Ci7: inode/linode=%p:%p "
+ "bindex=%d istart/end=%d:%d\n",
+ inode, lower_inode, bindex, istart, iend);
}
}
@@ -274,24 +272,22 @@ check_inode:
"istart/end=%d:%d\n", dentry,
lower_inode, bindex, istart, iend);
}
- } else { /* lower_inode == NULL */
- if (bindex >= istart && bindex <= iend) {
- /*
- * directories can have NULL lower inodes in
- * b/t start/end, but NOT if at the
- * start/end range.
- */
- if (unlikely(!(S_ISDIR(inode->i_mode) &&
- bindex > istart &&
- bindex < iend))) {
- PRINT_CALLER(fname, fxn, line);
- pr_debug(" CI7: dentry/linode=%p:%p "
- "bindex=%d istart/end=%d:%d\n",
- dentry, lower_inode, bindex,
- istart, iend);
- }
- }
+ continue;
}
+ /* if we get here, then lower_inode == NULL */
+ if (bindex < istart || bindex > iend)
+ continue;
+ /*
+ * directories can have NULL lower inodes in b/t start/end,
+ * but NOT if at the start/end range.
+ */
+ if (unlikely(S_ISDIR(inode->i_mode) &&
+ bindex > istart && bindex < iend))
+ continue;
+ PRINT_CALLER(fname, fxn, line);
+ pr_debug(" CI7: dentry/linode=%p:%p "
+ "bindex=%d istart/end=%d:%d\n",
+ dentry, lower_inode, bindex, istart, iend);
}
/*
--
1.5.2.2
next prev parent reply other threads:[~2007-11-26 16:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-26 16:43 [GIT PULL -mm] 00/16 Unionfs updates/fixes/cleanups Erez Zadok
2007-11-26 16:43 ` [PATCH 01/16] Unionfs: use f_path instead of f_dentry/mnt Erez Zadok
2007-11-26 16:43 ` [PATCH 02/16] Unionfs: minor cleanup in writepage Erez Zadok
2007-11-26 16:44 ` [PATCH 03/16] Unionfs: minor coding standards applied Erez Zadok
2007-11-26 16:44 ` Erez Zadok [this message]
2007-11-26 16:44 ` [PATCH 05/16] Unionfs: set lower mnt after mkdir which resulted in copyup Erez Zadok
2007-11-26 16:44 ` [PATCH 06/16] Unionfs: handle whiteouts more efficiently in filldir Erez Zadok
2007-11-26 16:44 ` [PATCH 07/16] Unionfs: remove useless debugging messages Erez Zadok
2007-11-26 16:44 ` [PATCH 08/16] Unionfs: release lower resources on successful rmdir Erez Zadok
2007-11-26 16:44 ` [PATCH 09/16] Unionfs: don't create whiteouts on rightmost branch Erez Zadok
2007-11-26 16:44 ` [PATCH 10/16] Unionfs: create opaque directories' whiteouts unconditionally Erez Zadok
2007-11-26 16:44 ` [PATCH 11/16] Unionfs: update times in setattr Erez Zadok
2007-11-26 16:44 ` [PATCH 12/16] Unionfs: reintroduce a bmap method Erez Zadok
2007-11-26 16:44 ` [PATCH 13/16] Unionfs: support splice(2) Erez Zadok
2007-11-26 16:44 ` [PATCH 14/16] Unionfs: prevent multiple writers to lower_page Erez Zadok
2007-11-26 16:44 ` [PATCH 15/16] Unionfs: update our inode size correctly upon partial write Erez Zadok
2007-11-26 16:44 ` [PATCH 16/16] Unionfs: use generic_file_aio_read/write Erez Zadok
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=11960954541631-git-send-email-ezk@cs.sunysb.edu \
--to=ezk@cs.sunysb.edu \
--cc=akpm@linux-foundation.org \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=viro@ftp.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).