diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 10:56:07 +1000 | 
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 10:56:07 +1000 | 
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /fs/udf/udfdecl.h | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
| download | olio-linux-3.10-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.xz olio-linux-3.10-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.zip  | |
Merge branch 'master' into next
Diffstat (limited to 'fs/udf/udfdecl.h')
| -rw-r--r-- | fs/udf/udfdecl.h | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 4223ac855da..702a1148e70 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -76,6 +76,7 @@ extern const struct inode_operations udf_dir_inode_operations;  extern const struct file_operations udf_dir_operations;  extern const struct inode_operations udf_file_inode_operations;  extern const struct file_operations udf_file_operations; +extern const struct inode_operations udf_symlink_inode_operations;  extern const struct address_space_operations udf_aops;  extern const struct address_space_operations udf_adinicb_aops;  extern const struct address_space_operations udf_symlink_aops; @@ -131,7 +132,7 @@ extern int udf_write_fi(struct inode *inode, struct fileIdentDesc *,  /* file.c */  extern int udf_ioctl(struct inode *, struct file *, unsigned int,  		     unsigned long); - +extern int udf_setattr(struct dentry *dentry, struct iattr *iattr);  /* inode.c */  extern struct inode *udf_iget(struct super_block *, struct kernel_lb_addr *);  extern int udf_sync_inode(struct inode *);  |