projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugzilla-13142' into release
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
fs
/
ufs
/
namei.c
diff --git
a/fs/ufs/namei.c
b/fs/ufs/namei.c
index
e84c0ec
..
23119fe
100644
(file)
--- a/
fs/ufs/namei.c
+++ b/
fs/ufs/namei.c
@@
-29,9
+29,10
@@
#include <linux/time.h>
#include <linux/fs.h>
#include <linux/time.h>
#include <linux/fs.h>
-#include <linux/ufs_fs.h>
#include <linux/smp_lock.h>
#include <linux/smp_lock.h>
-#include "swab.h" /* will go away - see comment in mknod() */
+
+#include "ufs_fs.h"
+#include "ufs.h"
#include "util.h"
static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
#include "util.h"
static inline int ufs_add_nondir(struct dentry *dentry, struct inode *inode)
@@
-57,10
+58,10
@@
static struct dentry *ufs_lookup(struct inode * dir, struct dentry *dentry, stru
lock_kernel();
ino = ufs_inode_by_name(dir, dentry);
if (ino) {
lock_kernel();
ino = ufs_inode_by_name(dir, dentry);
if (ino) {
- inode = iget(dir->i_sb, ino);
- if (
!inode
) {
+ inode =
ufs_
iget(dir->i_sb, ino);
+ if (
IS_ERR(inode)
) {
unlock_kernel();
unlock_kernel();
- return ERR_
PTR(-EACCES
);
+ return ERR_
CAST(inode
);
}
}
unlock_kernel();
}
}
unlock_kernel();
@@
-110,7
+111,6
@@
static int ufs_mknod (struct inode * dir, struct dentry *dentry, int mode, dev_t
err = PTR_ERR(inode);
if (!IS_ERR(inode)) {
init_special_inode(inode, mode, rdev);
err = PTR_ERR(inode);
if (!IS_ERR(inode)) {
init_special_inode(inode, mode, rdev);
- /* NOTE: that'll go when we get wide dev_t */
ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);
mark_inode_dirty(inode);
lock_kernel();
ufs_set_inode_dev(inode->i_sb, UFS_I(inode), rdev);
mark_inode_dirty(inode);
lock_kernel();
@@
-147,7
+147,7
@@
static int ufs_symlink (struct inode * dir, struct dentry * dentry,
} else {
/* fast symlink */
inode->i_op = &ufs_fast_symlink_inode_operations;
} else {
/* fast symlink */
inode->i_op = &ufs_fast_symlink_inode_operations;
- memcpy(
(char*)&UFS_I(inode)->i_u1.i_data,symname,
l);
+ memcpy(
UFS_I(inode)->i_u1.i_symlink, symname,
l);
inode->i_size = l-1;
}
mark_inode_dirty(inode);
inode->i_size = l-1;
}
mark_inode_dirty(inode);
@@
-355,7
+355,7
@@
out:
return err;
}
return err;
}
-struct inode_operations ufs_dir_inode_operations = {
+
const
struct inode_operations ufs_dir_inode_operations = {
.create = ufs_create,
.lookup = ufs_lookup,
.link = ufs_link,
.create = ufs_create,
.lookup = ufs_lookup,
.link = ufs_link,