projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lockd: save lock state on deferral
[powerpc.git]
/
fs
/
fuse
/
dir.c
diff --git
a/fs/fuse/dir.c
b/fs/fuse/dir.c
index
4008047
..
8890eba
100644
(file)
--- a/
fs/fuse/dir.c
+++ b/
fs/fuse/dir.c
@@
-195,7
+195,7
@@
static struct dentry_operations fuse_dentry_operations = {
.d_revalidate = fuse_dentry_revalidate,
};
.d_revalidate = fuse_dentry_revalidate,
};
-
static int valid_mod
e(int m)
+
int fuse_valid_typ
e(int m)
{
return S_ISREG(m) || S_ISDIR(m) || S_ISLNK(m) || S_ISCHR(m) ||
S_ISBLK(m) || S_ISFIFO(m) || S_ISSOCK(m);
{
return S_ISREG(m) || S_ISDIR(m) || S_ISLNK(m) || S_ISCHR(m) ||
S_ISBLK(m) || S_ISFIFO(m) || S_ISSOCK(m);
@@
-248,7
+248,8
@@
static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
fuse_put_request(fc, req);
/* Zero nodeid is same as -ENOENT, but with valid timeout */
if (!err && outarg.nodeid &&
fuse_put_request(fc, req);
/* Zero nodeid is same as -ENOENT, but with valid timeout */
if (!err && outarg.nodeid &&
- (invalid_nodeid(outarg.nodeid) || !valid_mode(outarg.attr.mode)))
+ (invalid_nodeid(outarg.nodeid) ||
+ !fuse_valid_type(outarg.attr.mode)))
err = -EIO;
if (!err && outarg.nodeid) {
inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation,
err = -EIO;
if (!err && outarg.nodeid) {
inode = fuse_iget(dir->i_sb, outarg.nodeid, outarg.generation,
@@
-1242,7
+1243,7
@@
static int fuse_removexattr(struct dentry *entry, const char *name)
return err;
}
return err;
}
-static struct inode_operations fuse_dir_inode_operations = {
+static
const
struct inode_operations fuse_dir_inode_operations = {
.lookup = fuse_lookup,
.mkdir = fuse_mkdir,
.symlink = fuse_symlink,
.lookup = fuse_lookup,
.mkdir = fuse_mkdir,
.symlink = fuse_symlink,
@@
-1270,7
+1271,7
@@
static const struct file_operations fuse_dir_operations = {
.fsync = fuse_dir_fsync,
};
.fsync = fuse_dir_fsync,
};
-static struct inode_operations fuse_common_inode_operations = {
+static
const
struct inode_operations fuse_common_inode_operations = {
.setattr = fuse_setattr,
.permission = fuse_permission,
.getattr = fuse_getattr,
.setattr = fuse_setattr,
.permission = fuse_permission,
.getattr = fuse_getattr,
@@
-1280,7
+1281,7
@@
static struct inode_operations fuse_common_inode_operations = {
.removexattr = fuse_removexattr,
};
.removexattr = fuse_removexattr,
};
-static struct inode_operations fuse_symlink_inode_operations = {
+static
const
struct inode_operations fuse_symlink_inode_operations = {
.setattr = fuse_setattr,
.follow_link = fuse_follow_link,
.put_link = fuse_put_link,
.setattr = fuse_setattr,
.follow_link = fuse_follow_link,
.put_link = fuse_put_link,