From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-mtd@lists.infradead.org
Cc: kernel@pengutronix.de, artem.bityutskiy@linux.intel.com,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org,
Subodh Nijsure <snijsure@grid-net.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH RFC 5/5] UBIFS: add ubifs_err() to print error reason
Date: Wed, 13 Feb 2013 11:23:18 +0100 [thread overview]
Message-ID: <1360750998-15191-6-git-send-email-mkl@pengutronix.de> (raw)
In-Reply-To: <1360750998-15191-1-git-send-email-mkl@pengutronix.de>
From: Subodh Nijsure <snijsure@grid-net.com>
This patch add ubifs_err() output to some error pathes to tell the user what's
going on.
Signed-off-by: Subodh Nijsure <snijsure@grid-net.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
fs/ubifs/dir.c | 20 ++++++++++++++++----
fs/ubifs/xattr.c | 12 ++++++++++--
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 6aa31b5..d0dd7a9 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -282,8 +282,11 @@ static int ubifs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
goto out_cancel;
err = ubifs_init_security(dir, inode, &dentry->d_name);
- if (err)
+ if (err) {
+ ubifs_err("cannot initialize extended attribute, error %d",
+ err);
goto out_cancel;
+ }
mutex_unlock(&dir_ui->ui_mutex);
ubifs_release_budget(c, &req);
@@ -748,8 +751,11 @@ static int ubifs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
}
err = ubifs_init_security(dir, inode, &dentry->d_name);
- if (err)
+ if (err) {
+ ubifs_err("cannot initialize extended attribute, error %d",
+ err);
goto out_cancel;
+ }
mutex_unlock(&dir_ui->ui_mutex);
ubifs_release_budget(c, &req);
@@ -828,8 +834,11 @@ static int ubifs_mknod(struct inode *dir, struct dentry *dentry,
goto out_cancel;
err = ubifs_init_security(dir, inode, &dentry->d_name);
- if (err)
+ if (err) {
+ ubifs_err("cannot initialize extended attribute, error %d",
+ err);
goto out_cancel;
+ }
mutex_unlock(&dir_ui->ui_mutex);
ubifs_release_budget(c, &req);
@@ -908,8 +917,11 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry,
goto out_cancel;
err = ubifs_init_security(dir, inode, &dentry->d_name);
- if (err)
+ if (err) {
+ ubifs_err("cannot initialize extended attribute, error %d",
+ err);
goto out_cancel;
+ }
mutex_unlock(&dir_ui->ui_mutex);
ubifs_release_budget(c, &req);
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index aa81bd3..380fcc9 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -107,8 +107,11 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
.new_ino_d = ALIGN(size, 8), .dirtied_ino = 1,
.dirtied_ino_d = ALIGN(host_ui->data_len, 8) };
- if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE)
+ if (host_ui->xattr_cnt >= MAX_XATTRS_PER_INODE) {
+ ubifs_err("ubifs xattr_cnt %d exceeds MAX_XATTR_PER_NODE (%d)",
+ host_ui->xattr_cnt, MAX_XATTRS_PER_INODE);
return -ENOSPC;
+ }
/*
* Linux limits the maximum size of the extended attribute names list
* to %XATTR_LIST_MAX. This means we should not allow creating more
@@ -116,8 +119,13 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
* is artificial for UBIFS, though.
*/
if (host_ui->xattr_names + host_ui->xattr_cnt +
- nm->len + 1 > XATTR_LIST_MAX)
+ nm->len + 1 > XATTR_LIST_MAX) {
+ ubifs_err("xattr name list too large %d > %d",
+ host_ui->xattr_names + host_ui->xattr_cnt +
+ nm->len + 1,
+ XATTR_LIST_MAX);
return -ENOSPC;
+ }
err = ubifs_budget_space(c, &req);
if (err)
--
1.7.10.4
next prev parent reply other threads:[~2013-02-13 10:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 10:23 [RFC PATCH 0/5] UBIFS: improve xattr and add support for security.* XATTR Marc Kleine-Budde
2013-02-13 10:23 ` [PATCH RFC 1/5] UBIFS: xattr: protect ui_size and data_len by ui_mutex Marc Kleine-Budde
2013-02-14 7:23 ` Artem Bityutskiy
2013-02-14 11:57 ` Marc Kleine-Budde
2013-02-13 10:23 ` [PATCH RFC 2/5] UBIFS: fix couple bugs in UBIFS extended attribute length calculation Marc Kleine-Budde
2013-02-13 10:23 ` [PATCH RFC 3/5] UBIFS: Add xattr support for symlinks Marc Kleine-Budde
2013-02-13 10:23 ` [PATCH RFC 4/5] UBIFS: Add security.* XATTR support for the UBIFS Marc Kleine-Budde
2013-02-14 7:28 ` Artem Bityutskiy
2013-02-14 12:05 ` Marc Kleine-Budde
2013-02-22 7:10 ` Artem Bityutskiy
2013-02-13 10:23 ` Marc Kleine-Budde [this message]
2013-02-14 7:29 ` [PATCH RFC 5/5] UBIFS: add ubifs_err() to print error reason Artem Bityutskiy
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=1360750998-15191-6-git-send-email-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=artem.bityutskiy@linux.intel.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-security-module@vger.kernel.org \
--cc=snijsure@grid-net.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®