projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../scsi-rc-fixes-2.6
[powerpc.git]
/
fs
/
fuse
/
fuse_i.h
diff --git
a/fs/fuse/fuse_i.h
b/fs/fuse/fuse_i.h
index
0dbf966
..
91edb89
100644
(file)
--- a/
fs/fuse/fuse_i.h
+++ b/
fs/fuse/fuse_i.h
@@
-59,7
+59,7
@@
struct fuse_inode {
struct fuse_req *forget_req;
/** Time in jiffies until the file attributes are valid */
struct fuse_req *forget_req;
/** Time in jiffies until the file attributes are valid */
- u
nsigned long
i_time;
+ u
64
i_time;
};
/** FUSE specific file data */
};
/** FUSE specific file data */
@@
-239,6
+239,9
@@
struct fuse_conn {
/** Lock protecting accessess to members of this structure */
spinlock_t lock;
/** Lock protecting accessess to members of this structure */
spinlock_t lock;
+ /** Mutex protecting against directory alias creation */
+ struct mutex inst_mutex;
+
/** Refcount */
atomic_t count;
/** Refcount */
atomic_t count;