diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 21:46:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 21:46:36 -0800 |
| commit | 5cd9599bba428762025db6027764f1c59d0b1e1b (patch) | |
| tree | cb59ea13f6e6de4350ca38338bf9633e89f8418a /fs/coda/coda_fs_i.h | |
| parent | e343a895a9f342f239c5e3c5ffc6c0b1707e6244 (diff) | |
| parent | d668dc56631da067540b2494d2a1f29ff7b5f15a (diff) | |
| download | op-kernel-dev-5cd9599bba428762025db6027764f1c59d0b1e1b.zip op-kernel-dev-5cd9599bba428762025db6027764f1c59d0b1e1b.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
autofs4: deal with autofs4_write/autofs4_write races
autofs4: catatonic_mode vs. notify_daemon race
autofs4: autofs4_wait() vs. autofs4_catatonic_mode() race
hfsplus: creation of hidden dir on mount can fail
block_dev: Suppress bdev_cache_init() kmemleak warninig
fix shrink_dcache_parent() livelock
coda: switch coda_cnode_make() to sane API as well, clean coda_lookup()
coda: deal correctly with allocation failure from coda_cnode_makectl()
securityfs: fix object creation races
Diffstat (limited to 'fs/coda/coda_fs_i.h')
| -rw-r--r-- | fs/coda/coda_fs_i.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/coda/coda_fs_i.h b/fs/coda/coda_fs_i.h index e35071b..b24fdfd 100644 --- a/fs/coda/coda_fs_i.h +++ b/fs/coda/coda_fs_i.h @@ -49,9 +49,9 @@ struct coda_file_info { #define C_DYING 0x4 /* from venus (which died) */ #define C_PURGE 0x8 -int coda_cnode_make(struct inode **, struct CodaFid *, struct super_block *); +struct inode *coda_cnode_make(struct CodaFid *, struct super_block *); struct inode *coda_iget(struct super_block *sb, struct CodaFid *fid, struct coda_vattr *attr); -int coda_cnode_makectl(struct inode **inode, struct super_block *sb); +struct inode *coda_cnode_makectl(struct super_block *sb); struct inode *coda_fid_to_inode(struct CodaFid *fid, struct super_block *sb); void coda_replace_fid(struct inode *, struct CodaFid *, struct CodaFid *); |
