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
Merge branch 'next' into for-linus-3.0
[pandora-kernel.git]
/
fs
/
cramfs
/
inode.c
diff --git
a/fs/cramfs/inode.c
b/fs/cramfs/inode.c
index
e141939
..
739fb59
100644
(file)
--- a/
fs/cramfs/inode.c
+++ b/
fs/cramfs/inode.c
@@
-37,7
+37,7
@@
static DEFINE_MUTEX(read_mutex);
/* These macros may change in future, to provide better st_ino semantics. */
#define OFFSET(x) ((x)->i_ino)
/* These macros may change in future, to provide better st_ino semantics. */
#define OFFSET(x) ((x)->i_ino)
-static unsigned long cramino(struct cramfs_inode *cino, unsigned int offset)
+static unsigned long cramino(
const
struct cramfs_inode *cino, unsigned int offset)
{
if (!cino->offset)
return offset + 1;
{
if (!cino->offset)
return offset + 1;
@@
-61,7
+61,7
@@
static unsigned long cramino(struct cramfs_inode *cino, unsigned int offset)
}
static struct inode *get_cramfs_inode(struct super_block *sb,
}
static struct inode *get_cramfs_inode(struct super_block *sb,
- struct cramfs_inode *cramfs_inode, unsigned int offset)
+
const
struct cramfs_inode *cramfs_inode, unsigned int offset)
{
struct inode *inode;
static struct timespec zerotime;
{
struct inode *inode;
static struct timespec zerotime;
@@
-317,7
+317,7
@@
static int cramfs_fill_super(struct super_block *sb, void *data, int silent)
/* Set it all up.. */
sb->s_op = &cramfs_ops;
root = get_cramfs_inode(sb, &super.root, 0);
/* Set it all up.. */
sb->s_op = &cramfs_ops;
root = get_cramfs_inode(sb, &super.root, 0);
- if (
!root
)
+ if (
IS_ERR(root)
)
goto out;
sb->s_root = d_alloc_root(root);
if (!sb->s_root) {
goto out;
sb->s_root = d_alloc_root(root);
if (!sb->s_root) {
@@
-423,6
+423,7
@@
static int cramfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
{
unsigned int offset = 0;
static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
{
unsigned int offset = 0;
+ struct inode *inode = NULL;
int sorted;
mutex_lock(&read_mutex);
int sorted;
mutex_lock(&read_mutex);
@@
-449,8
+450,8
@@
static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, s
for (;;) {
if (!namelen) {
for (;;) {
if (!namelen) {
-
mutex_unlock(&read_mutex
);
-
return ERR_PTR(-EIO)
;
+
inode = ERR_PTR(-EIO
);
+
goto out
;
}
if (name[namelen-1])
break;
}
if (name[namelen-1])
break;
@@
-462,17
+463,18
@@
static struct dentry * cramfs_lookup(struct inode *dir, struct dentry *dentry, s
if (retval > 0)
continue;
if (!retval) {
if (retval > 0)
continue;
if (!retval) {
- struct cramfs_inode entry = *de;
- mutex_unlock(&read_mutex);
- d_add(dentry, get_cramfs_inode(dir->i_sb, &entry, dir_off));
- return NULL;
+ inode = get_cramfs_inode(dir->i_sb, de, dir_off);
+ break;
}
/* else (retval < 0) */
if (sorted)
break;
}
}
/* else (retval < 0) */
if (sorted)
break;
}
+out:
mutex_unlock(&read_mutex);
mutex_unlock(&read_mutex);
- d_add(dentry, NULL);
+ if (IS_ERR(inode))
+ return ERR_CAST(inode);
+ d_add(dentry, inode);
return NULL;
}
return NULL;
}