From 2e59b56d5a60165dbd313282816b3438f4375200 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Jul 2011 03:26:05 -0400 Subject: [PATCH] --- yaml --- r: 280259 b: refs/heads/master c: e021d7b7fd364e0ad1b8d65af80995c72f321419 h: refs/heads/master i: 280257: a1278a73b1108d22e2719f87c05015356d8d3b92 280255: 3a6cde21084aaefd57960a22b60480cc00e8cf32 v: v3 --- [refs] | 2 +- trunk/fs/hfs/hfs_fs.h | 2 +- trunk/fs/hfs/inode.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 40114aab2d26..246e5c20edb0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5206efd62ce49cf5c7940d81c22bc556fc843de2 +refs/heads/master: e021d7b7fd364e0ad1b8d65af80995c72f321419 diff --git a/trunk/fs/hfs/hfs_fs.h b/trunk/fs/hfs/hfs_fs.h index ad97c2d58287..1bf967c6bfdc 100644 --- a/trunk/fs/hfs/hfs_fs.h +++ b/trunk/fs/hfs/hfs_fs.h @@ -184,7 +184,7 @@ extern int hfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern const struct address_space_operations hfs_aops; extern const struct address_space_operations hfs_btree_aops; -extern struct inode *hfs_new_inode(struct inode *, struct qstr *, int); +extern struct inode *hfs_new_inode(struct inode *, struct qstr *, umode_t); extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *); extern int hfs_write_inode(struct inode *, struct writeback_control *); extern int hfs_inode_setattr(struct dentry *, struct iattr *); diff --git a/trunk/fs/hfs/inode.c b/trunk/fs/hfs/inode.c index a1a9fdcd2a00..737dbeb64320 100644 --- a/trunk/fs/hfs/inode.c +++ b/trunk/fs/hfs/inode.c @@ -169,7 +169,7 @@ const struct address_space_operations hfs_aops = { /* * hfs_new_inode */ -struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, int mode) +struct inode *hfs_new_inode(struct inode *dir, struct qstr *name, umode_t mode) { struct super_block *sb = dir->i_sb; struct inode *inode = new_inode(sb);