projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://oss.sgi.com:8090/xfs-2.6
[powerpc.git]
/
fs
/
super.c
diff --git
a/fs/super.c
b/fs/super.c
index
425861c
..
a66f66b
100644
(file)
--- a/
fs/super.c
+++ b/
fs/super.c
@@
-37,6
+37,7
@@
#include <linux/writeback.h> /* for the emergency remount stuff */
#include <linux/idr.h>
#include <linux/kobject.h>
#include <linux/writeback.h> /* for the emergency remount stuff */
#include <linux/idr.h>
#include <linux/kobject.h>
+#include <linux/mutex.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
@@
-55,11
+56,10
@@
DEFINE_SPINLOCK(sb_lock);
*/
static struct super_block *alloc_super(void)
{
*/
static struct super_block *alloc_super(void)
{
- struct super_block *s = k
m
alloc(sizeof(struct super_block), GFP_USER);
+ struct super_block *s = k
z
alloc(sizeof(struct super_block), GFP_USER);
static struct super_operations default_op;
if (s) {
static struct super_operations default_op;
if (s) {
- memset(s, 0, sizeof(struct super_block));
if (security_sb_alloc(s)) {
kfree(s);
s = NULL;
if (security_sb_alloc(s)) {
kfree(s);
s = NULL;
@@
-381,9
+381,9
@@
restart:
void sync_filesystems(int wait)
{
struct super_block *sb;
void sync_filesystems(int wait)
{
struct super_block *sb;
- static DE
CLAR
E_MUTEX(mutex);
+ static DE
FIN
E_MUTEX(mutex);
-
down(&mutex);
/* Could be down_interruptible */
+
mutex_lock(&mutex);
/* Could be down_interruptible */
spin_lock(&sb_lock);
list_for_each_entry(sb, &super_blocks, s_list) {
if (!sb->s_op->sync_fs)
spin_lock(&sb_lock);
list_for_each_entry(sb, &super_blocks, s_list) {
if (!sb->s_op->sync_fs)
@@
-412,7
+412,7
@@
restart:
goto restart;
}
spin_unlock(&sb_lock);
goto restart;
}
spin_unlock(&sb_lock);
-
up
(&mutex);
+
mutex_unlock
(&mutex);
}
/**
}
/**
@@
-712,7
+712,7
@@
struct super_block *get_sb_bdev(struct file_system_type *fs_type,
s->s_flags = flags;
strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
sb_set_blocksize(s, block_size(bdev));
s->s_flags = flags;
strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
sb_set_blocksize(s, block_size(bdev));
- error = fill_super(s, data, flags & MS_
VERBOSE
? 1 : 0);
+ error = fill_super(s, data, flags & MS_
SILENT
? 1 : 0);
if (error) {
up_write(&s->s_umount);
deactivate_super(s);
if (error) {
up_write(&s->s_umount);
deactivate_super(s);
@@
-756,7
+756,7
@@
struct super_block *get_sb_nodev(struct file_system_type *fs_type,
s->s_flags = flags;
s->s_flags = flags;
- error = fill_super(s, data, flags & MS_
VERBOSE
? 1 : 0);
+ error = fill_super(s, data, flags & MS_
SILENT
? 1 : 0);
if (error) {
up_write(&s->s_umount);
deactivate_super(s);
if (error) {
up_write(&s->s_umount);
deactivate_super(s);
@@
-785,7
+785,7
@@
struct super_block *get_sb_single(struct file_system_type *fs_type,
return s;
if (!s->s_root) {
s->s_flags = flags;
return s;
if (!s->s_root) {
s->s_flags = flags;
- error = fill_super(s, data, flags & MS_
VERBOSE
? 1 : 0);
+ error = fill_super(s, data, flags & MS_
SILENT
? 1 : 0);
if (error) {
up_write(&s->s_umount);
deactivate_super(s);
if (error) {
up_write(&s->s_umount);
deactivate_super(s);