projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux...
[cascardo/linux.git]
/
fs
/
bfs
/
file.c
diff --git
a/fs/bfs/file.c
b/fs/bfs/file.c
index
b11e63e
..
6a02126
100644
(file)
--- a/
fs/bfs/file.c
+++ b/
fs/bfs/file.c
@@
-99,7
+99,7
@@
static int bfs_get_block(struct inode *inode, sector_t block,
return -ENOSPC;
/* The rest has to be protected against itself. */
return -ENOSPC;
/* The rest has to be protected against itself. */
-
lock_kernel(
);
+
mutex_lock(&info->bfs_lock
);
/*
* If the last data block for this file is the last allocated
/*
* If the last data block for this file is the last allocated
@@
-151,7
+151,7
@@
static int bfs_get_block(struct inode *inode, sector_t block,
mark_buffer_dirty(sbh);
map_bh(bh_result, sb, phys);
out:
mark_buffer_dirty(sbh);
map_bh(bh_result, sb, phys);
out:
-
unlock_kernel(
);
+
mutex_unlock(&info->bfs_lock
);
return err;
}
return err;
}