aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-04-26 14:43:43 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2007-04-26 16:39:08 -0400
commita9f5f70739363ccca2e771c274c4f015c5fb7a88 (patch)
tree243c6d9f7ba7151b6a7afc65a53682d0c5eb6b9a /fs/ocfs2
parentbebe6f120b036349f7212205eeaf8248d4820c4b (diff)
ocfs2: filter more error prints
We don't want to print anything at all in ocfs2_lookup() when getting an error from ocfs2_iget() - it could be something as innocuous as a signal being detected in the dlm. ocfs2_permission() should filter on -ENOENT which ocfs2_meta_lock() can return if the inode was deleted on another node. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/file.c3
-rw-r--r--fs/ocfs2/namei.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index f2cd3bf9efb2..25e36fbd7bc3 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -972,7 +972,8 @@ int ocfs2_permission(struct inode *inode, int mask, struct nameidata *nd)
972 972
973 ret = ocfs2_meta_lock(inode, NULL, 0); 973 ret = ocfs2_meta_lock(inode, NULL, 0);
974 if (ret) { 974 if (ret) {
975 mlog_errno(ret); 975 if (ret != -ENOENT)
976 mlog_errno(ret);
976 goto out; 977 goto out;
977 } 978 }
978 979
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index 28dd757ff67d..1fff0c02d98b 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -175,8 +175,6 @@ static struct dentry *ocfs2_lookup(struct inode *dir, struct dentry *dentry,
175 175
176 inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno, 0); 176 inode = ocfs2_iget(OCFS2_SB(dir->i_sb), blkno, 0);
177 if (IS_ERR(inode)) { 177 if (IS_ERR(inode)) {
178 mlog(ML_ERROR, "Unable to create inode %llu\n",
179 (unsigned long long)blkno);
180 ret = ERR_PTR(-EACCES); 178 ret = ERR_PTR(-EACCES);
181 goto bail_unlock; 179 goto bail_unlock;
182 } 180 }