git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
fuse
/
fuse_i.h
diff --git
a/fs/fuse/fuse_i.h
b/fs/fuse/fuse_i.h
index
69c7750
..
b98b20d
100644
(file)
--- a/
fs/fuse/fuse_i.h
+++ b/
fs/fuse/fuse_i.h
@@
-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;
@@
-295,6
+298,9
@@
struct fuse_conn {
reply, before any other request, and never cleared */
unsigned conn_error : 1;
reply, before any other request, and never cleared */
unsigned conn_error : 1;
+ /** Connection successful. Only set in INIT */
+ unsigned conn_init : 1;
+
/** Do readpages asynchronously? Only set in INIT */
unsigned async_read : 1;
/** Do readpages asynchronously? Only set in INIT */
unsigned async_read : 1;
@@
-336,6
+342,9
@@
struct fuse_conn {
/** Is interrupt not implemented by fs? */
unsigned no_interrupt : 1;
/** Is interrupt not implemented by fs? */
unsigned no_interrupt : 1;
+ /** Is bmap not implemented by fs? */
+ unsigned no_bmap : 1;
+
/** The number of requests waiting for completion */
atomic_t num_waiting;
/** The number of requests waiting for completion */
atomic_t num_waiting;
@@
-362,6
+371,9
@@
struct fuse_conn {
/** Key for lock owner ID scrambling */
u32 scramble_key[4];
/** Key for lock owner ID scrambling */
u32 scramble_key[4];
+
+ /** Reserved request for the DESTROY message */
+ struct fuse_req *destroy_req;
};
static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)
};
static inline struct fuse_conn *get_fuse_conn_super(struct super_block *sb)