Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116287
b: refs/heads/master
c: 29d434b
h: refs/heads/master
i:
  116285: 4a84696
  116283: 2367a2b
  116279: aa1e31d
  116271: 760e98d
  116255: f7f8ea8
  116223: 1b5e16c
v: v3
  • Loading branch information
Tejun Heo authored and Miklos Szeredi committed Oct 16, 2008
1 parent cc46cc0 commit ce40a85
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 37194d0723b9b68b4b299b2564ca99e3d0a094c3
refs/heads/master: 29d434b39c807320fbe4bcdce0ab98a0b9fcb285
5 changes: 5 additions & 0 deletions trunk/fs/fuse/fuse_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
See the file COPYING.
*/

#ifndef _FS_FUSE_I_H
#define _FS_FUSE_I_H

#include <linux/fuse.h>
#include <linux/fs.h>
#include <linux/mount.h>
Expand Down Expand Up @@ -655,3 +658,5 @@ void fuse_set_nowrite(struct inode *inode);
void fuse_release_nowrite(struct inode *inode);

u64 fuse_get_attr_version(struct fuse_conn *fc);

#endif /* _FS_FUSE_I_H */
5 changes: 5 additions & 0 deletions trunk/include/linux/fuse.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
* - add file flags field to fuse_read_in and fuse_write_in
*/

#ifndef _LINUX_FUSE_H
#define _LINUX_FUSE_H

#include <asm/types.h>
#include <linux/major.h>

Expand Down Expand Up @@ -409,3 +412,5 @@ struct fuse_dirent {
#define FUSE_DIRENT_ALIGN(x) (((x) + sizeof(__u64) - 1) & ~(sizeof(__u64) - 1))
#define FUSE_DIRENT_SIZE(d) \
FUSE_DIRENT_ALIGN(FUSE_NAME_OFFSET + (d)->namelen)

#endif /* _LINUX_FUSE_H */

0 comments on commit ce40a85

Please sign in to comment.