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
patch-2_6_7-vs1_9_1_12
[linux-2.6.git]
/
fs
/
ntfs
/
inode.h
diff --git
a/fs/ntfs/inode.h
b/fs/ntfs/inode.h
index
31d5220
..
59af63e
100644
(file)
--- a/
fs/ntfs/inode.h
+++ b/
fs/ntfs/inode.h
@@
-54,7
+54,7
@@
struct _ntfs_inode {
* name_len = 4 for directories.
*/
ATTR_TYPES type; /* Attribute type of this fake inode. */
* name_len = 4 for directories.
*/
ATTR_TYPES type; /* Attribute type of this fake inode. */
-
uchar_t *name;
/* Attribute name of this fake inode. */
+
ntfschar *name;
/* Attribute name of this fake inode. */
u32 name_len; /* Attribute name length of this fake inode. */
run_list run_list; /* If state has the NI_NonResident bit set,
the run list of the unnamed data attribute
u32 name_len; /* Attribute name length of this fake inode. */
run_list run_list; /* If state has the NI_NonResident bit set,
the run list of the unnamed data attribute
@@
-248,7
+248,7
@@
static inline struct inode *VFS_I(ntfs_inode *ni)
*/
typedef struct {
unsigned long mft_no;
*/
typedef struct {
unsigned long mft_no;
-
uchar_t
*name;
+
ntfschar
*name;
u32 name_len;
ATTR_TYPES type;
} ntfs_attr;
u32 name_len;
ATTR_TYPES type;
} ntfs_attr;
@@
-259,7
+259,7
@@
extern int ntfs_test_inode(struct inode *vi, ntfs_attr *na);
extern struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no);
extern struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPES type,
extern struct inode *ntfs_iget(struct super_block *sb, unsigned long mft_no);
extern struct inode *ntfs_attr_iget(struct inode *base_vi, ATTR_TYPES type,
-
uchar_t
*name, u32 name_len);
+
ntfschar
*name, u32 name_len);
extern struct inode *ntfs_alloc_big_inode(struct super_block *sb);
extern void ntfs_destroy_big_inode(struct inode *inode);
extern struct inode *ntfs_alloc_big_inode(struct super_block *sb);
extern void ntfs_destroy_big_inode(struct inode *inode);
@@
-269,7
+269,7
@@
extern ntfs_inode *ntfs_new_extent_inode(struct super_block *sb,
unsigned long mft_no);
extern void ntfs_clear_extent_inode(ntfs_inode *ni);
unsigned long mft_no);
extern void ntfs_clear_extent_inode(ntfs_inode *ni);
-extern
void
ntfs_read_inode_mount(struct inode *vi);
+extern
int
ntfs_read_inode_mount(struct inode *vi);
extern void ntfs_put_inode(struct inode *vi);
extern void ntfs_put_inode(struct inode *vi);
@@
-281,6
+281,15
@@
extern void ntfs_truncate(struct inode *vi);
extern int ntfs_setattr(struct dentry *dentry, struct iattr *attr);
extern int ntfs_setattr(struct dentry *dentry, struct iattr *attr);
+extern void ntfs_write_inode(struct inode *vi, int sync);
+
+static inline void ntfs_commit_inode(struct inode *vi)
+{
+ if (!is_bad_inode(vi))
+ ntfs_write_inode(vi, 1);
+ return;
+}
+
#endif /* NTFS_RW */
#endif /* _LINUX_NTFS_INODE_H */
#endif /* NTFS_RW */
#endif /* _LINUX_NTFS_INODE_H */