git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] nfsd: change uses of f_{dentry, vfsmnt} to use f_path
[pandora-kernel.git]
/
fs
/
dquot.c
diff --git
a/fs/dquot.c
b/fs/dquot.c
index
9af7895
..
0952cc4
100644
(file)
--- a/
fs/dquot.c
+++ b/
fs/dquot.c
@@
-131,7
+131,7
@@
static struct quota_format_type *quota_formats; /* List of registered formats */
static struct quota_module_name module_names[] = INIT_QUOTA_MODULE_NAMES;
/* SLAB cache for dquot structures */
static struct quota_module_name module_names[] = INIT_QUOTA_MODULE_NAMES;
/* SLAB cache for dquot structures */
-static
kmem_cache_t
*dquot_cachep;
+static
struct kmem_cache
*dquot_cachep;
int register_quota_format(struct quota_format_type *fmt)
{
int register_quota_format(struct quota_format_type *fmt)
{
@@
-600,7
+600,7
@@
static struct dquot *get_empty_dquot(struct super_block *sb, int type)
{
struct dquot *dquot;
{
struct dquot *dquot;
- dquot = kmem_cache_alloc(dquot_cachep,
SLAB
_NOFS);
+ dquot = kmem_cache_alloc(dquot_cachep,
GFP
_NOFS);
if(!dquot)
return NODQUOT;
if(!dquot)
return NODQUOT;
@@
-694,9
+694,9
@@
restart:
file_list_lock();
list_for_each(p, &sb->s_files) {
struct file *filp = list_entry(p, struct file, f_u.fu_list);
file_list_lock();
list_for_each(p, &sb->s_files) {
struct file *filp = list_entry(p, struct file, f_u.fu_list);
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_
path.
dentry->d_inode;
if (filp->f_mode & FMODE_WRITE && dqinit_needed(inode, type)) {
if (filp->f_mode & FMODE_WRITE && dqinit_needed(inode, type)) {
- struct dentry *dentry = dget(filp->f_dentry);
+ struct dentry *dentry = dget(filp->f_
path.
dentry);
file_list_unlock();
sb->dq_op->initialize(inode, type);
dput(dentry);
file_list_unlock();
sb->dq_op->initialize(inode, type);
dput(dentry);
@@
-828,6
+828,7
@@
static inline int need_print_warning(struct dquot *dquot)
static void print_warning(struct dquot *dquot, const char warntype)
{
char *msg = NULL;
static void print_warning(struct dquot *dquot, const char warntype)
{
char *msg = NULL;
+ struct tty_struct *tty;
int flag = (warntype == BHARDWARN || warntype == BSOFTLONGWARN) ? DQ_BLKS_B :
((warntype == IHARDWARN || warntype == ISOFTLONGWARN) ? DQ_INODES_B : 0);
int flag = (warntype == BHARDWARN || warntype == BSOFTLONGWARN) ? DQ_BLKS_B :
((warntype == IHARDWARN || warntype == ISOFTLONGWARN) ? DQ_INODES_B : 0);
@@
-835,14
+836,15
@@
static void print_warning(struct dquot *dquot, const char warntype)
return;
mutex_lock(&tty_mutex);
return;
mutex_lock(&tty_mutex);
- if (!current->signal->tty)
+ tty = get_current_tty();
+ if (!tty)
goto out_lock;
goto out_lock;
- tty_write_message(
current->signal->
tty, dquot->dq_sb->s_id);
+ tty_write_message(tty, dquot->dq_sb->s_id);
if (warntype == ISOFTWARN || warntype == BSOFTWARN)
if (warntype == ISOFTWARN || warntype == BSOFTWARN)
- tty_write_message(
current->signal->
tty, ": warning, ");
+ tty_write_message(tty, ": warning, ");
else
else
- tty_write_message(
current->signal->
tty, ": write failed, ");
- tty_write_message(
current->signal->
tty, quotatypes[dquot->dq_type]);
+ tty_write_message(tty, ": write failed, ");
+ tty_write_message(tty, quotatypes[dquot->dq_type]);
switch (warntype) {
case IHARDWARN:
msg = " file limit reached.\r\n";
switch (warntype) {
case IHARDWARN:
msg = " file limit reached.\r\n";
@@
-863,7
+865,7
@@
static void print_warning(struct dquot *dquot, const char warntype)
msg = " block quota exceeded.\r\n";
break;
}
msg = " block quota exceeded.\r\n";
break;
}
- tty_write_message(
current->signal->
tty, msg);
+ tty_write_message(tty, msg);
out_lock:
mutex_unlock(&tty_mutex);
}
out_lock:
mutex_unlock(&tty_mutex);
}