projects
/
yaffs2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
39673b8
)
Apply Reed's deadlocking fix (manually applied)
author
charles
<charles>
Thu, 8 Dec 2005 00:54:55 +0000
(
00:54
+0000)
committer
charles
<charles>
Thu, 8 Dec 2005 00:54:55 +0000
(
00:54
+0000)
yaffs_fs.c
patch
|
blob
|
history
diff --git
a/yaffs_fs.c
b/yaffs_fs.c
index f97455b00a71453ca5c654f5c5565fab10f6a2b3..b9d440bd3745632a99f8bfd8300680a1ae1a798c 100644
(file)
--- a/
yaffs_fs.c
+++ b/
yaffs_fs.c
@@
-31,7
+31,7
@@
*/
const char *yaffs_fs_c_version =
*/
const char *yaffs_fs_c_version =
- "$Id: yaffs_fs.c,v 1.3
5 2005-12-07 22:19:26
charles Exp $";
+ "$Id: yaffs_fs.c,v 1.3
6 2005-12-08 00:54:55
charles Exp $";
extern const char *yaffs_guts_c_version;
#include <linux/config.h>
extern const char *yaffs_guts_c_version;
#include <linux/config.h>
@@
-309,6
+309,9
@@
static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
dentry->d_name.name);
obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */
dentry->d_name.name);
obj = yaffs_GetEquivalentObject(obj); /* in case it was a hardlink */
+
+ /* Can't hold gross lock when calling yaffs_get_inode() */
+ yaffs_GrossUnlock(dev);
if (obj) {
T(YAFFS_TRACE_OS,
if (obj) {
T(YAFFS_TRACE_OS,
@@
-325,8
+328,6
@@
static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
/*dget(dentry); // try to solve directory bug */
d_add(dentry, inode);
/*dget(dentry); // try to solve directory bug */
d_add(dentry, inode);
- yaffs_GrossUnlock(dev);
-
/* return dentry; */
return NULL;
#endif
/* return dentry; */
return NULL;
#endif
@@
-336,7
+337,6
@@
static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry)
T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
}
T(YAFFS_TRACE_OS, (KERN_DEBUG "yaffs_lookup not found\n"));
}
- yaffs_GrossUnlock(dev);
/* added NCB for 2.5/6 compatability - forces add even if inode is
* NULL which creates dentry hash */
/* added NCB for 2.5/6 compatability - forces add even if inode is
* NULL which creates dentry hash */
@@
-725,6
+725,7
@@
struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev,
/* NB Side effect: iget calls back to yaffs_read_inode(). */
/* iget also increments the inode's i_count */
/* NB Side effect: iget calls back to yaffs_read_inode(). */
/* iget also increments the inode's i_count */
+ /* NB You can't be holding grossLock or deadlock will happen! */
return inode;
}
return inode;
}
@@
-940,6
+941,9
@@
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
obj = NULL; /* Do we ever get here? */
break;
}
obj = NULL; /* Do we ever get here? */
break;
}
+
+ /* Can not call yaffs_get_inode() with gross lock held */
+ yaffs_GrossUnlock(dev);
if (obj) {
inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
if (obj) {
inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj);
@@
-954,8
+958,6
@@
static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode,
error = -ENOMEM;
}
error = -ENOMEM;
}
- yaffs_GrossUnlock(dev);
-
return error;
}
return error;
}
@@
-1236,8
+1238,9
@@
static int yaffs_statfs(struct super_block *sb, struct statfs *buf)
static void yaffs_read_inode(struct inode *inode)
{
static void yaffs_read_inode(struct inode *inode)
{
- /* NB This is called as a side effect of other functions and
- * thus gross locking should always be in place already.
+ /* NB This is called as a side effect of other functions, but
+ * we had to release the lock to prevent deadlocks, so
+ * need to lock again.
*/
yaffs_Object *obj;
*/
yaffs_Object *obj;
@@
-1246,10
+1249,13
@@
static void yaffs_read_inode(struct inode *inode)
T(YAFFS_TRACE_OS,
(KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
T(YAFFS_TRACE_OS,
(KERN_DEBUG "yaffs_read_inode for %d\n", (int)inode->i_ino));
+ yaffs_GrossLock(dev);
+
obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
yaffs_FillInodeFromObject(inode, obj);
obj = yaffs_FindObjectByNumber(dev, inode->i_ino);
yaffs_FillInodeFromObject(inode, obj);
+ yaffs_GrossUnlock(dev);
}
static LIST_HEAD(yaffs_dev_list);
}
static LIST_HEAD(yaffs_dev_list);
@@
-1481,14
+1487,15
@@
static struct super_block *yaffs_internal_read_super(int yaffsVersion,
T(YAFFS_TRACE_OS,
("yaffs_read_super: guts initialised %s\n",
(err == YAFFS_OK) ? "OK" : "FAILED"));
T(YAFFS_TRACE_OS,
("yaffs_read_super: guts initialised %s\n",
(err == YAFFS_OK) ? "OK" : "FAILED"));
+
+ /* Release lock before yaffs_get_inode() */
+ yaffs_GrossUnlock(dev);
/* Create root inode */
if (err == YAFFS_OK)
inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0,
yaffs_Root(dev));
/* Create root inode */
if (err == YAFFS_OK)
inode = yaffs_get_inode(sb, S_IFDIR | 0755, 0,
yaffs_Root(dev));
- yaffs_GrossUnlock(dev);
-
if (!inode)
return NULL;
if (!inode)
return NULL;