diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 23:47:27 +0100 |
| commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
| tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /fs/fuse/fuse_i.h | |
| parent | ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init (diff) | |
| parent | ARM: OMAP2+: Fix eMMC on n900 with device tree (diff) | |
| download | linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.xz linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip | |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'fs/fuse/fuse_i.h')
| -rw-r--r-- | fs/fuse/fuse_i.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 5b9e6f3b6aef..7d2730912667 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -321,6 +321,7 @@ struct fuse_req { struct { struct fuse_write_in in; struct fuse_write_out out; + struct fuse_req *next; } write; struct fuse_notify_retrieve_in retrieve_in; struct fuse_lk_in lk_in; @@ -374,12 +375,11 @@ struct fuse_conn { /** 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; + struct rcu_head rcu; + /** The user id for this mount */ kuid_t user_id; |