git.samba.org
/
sfrench
/
cifs-2.6.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/mszeredi...
[sfrench/cifs-2.6.git]
/
fs
/
fuse
/
dir.c
diff --git
a/fs/fuse/dir.c
b/fs/fuse/dir.c
index 811fd8929a18c1e330316202fd40ac58857ec3c7..00800c07ba1c89bda7abd8f15aa760b9ddccc869 100644
(file)
--- a/
fs/fuse/dir.c
+++ b/
fs/fuse/dir.c
@@
-473,7
+473,7
@@
static int fuse_create_open(struct inode *dir, struct dentry *entry,
if (err) {
fuse_sync_release(ff, flags);
} else {
if (err) {
fuse_sync_release(ff, flags);
} else {
- file->private_data = f
use_file_get(ff)
;
+ file->private_data = f
f
;
fuse_finish_open(inode, file);
}
return err;
fuse_finish_open(inode, file);
}
return err;
@@
-1777,10
+1777,10
@@
static int fuse_setattr(struct dentry *entry, struct iattr *attr)
return ret;
}
return ret;
}
-static int fuse_getattr(
struct vfsmount *mnt, struct dentry *entry
,
-
struct kstat *stat
)
+static int fuse_getattr(
const struct path *path, struct kstat *stat
,
+
u32 request_mask, unsigned int flags
)
{
{
- struct inode *inode = d_inode(entry);
+ struct inode *inode = d_inode(
path->d
entry);
struct fuse_conn *fc = get_fuse_conn(inode);
if (!fuse_allow_current_process(fc))
struct fuse_conn *fc = get_fuse_conn(inode);
if (!fuse_allow_current_process(fc))