From 3bd004b42a01035b05f0acc3e533a75959f01366 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 26 Jul 2011 03:12:59 -0400
Subject: [PATCH] --- yaml --- r: 280249 b: refs/heads/master c:
 ad44be5c7820f5b8ce97292f4bcb3de73625c35b h: refs/heads/master i:   280247:
 f6bbc1b3c02366df3be3331b303b0bc088dd5d13 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ubifs/dir.c   | 4 ++--
 trunk/fs/ubifs/ubifs.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3b358b99b3e4..5d05c524f3d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eee25cacde61c37f1545a33d7fed88b14349976
+refs/heads/master: ad44be5c7820f5b8ce97292f4bcb3de73625c35b
diff --git a/trunk/fs/ubifs/dir.c b/trunk/fs/ubifs/dir.c
index d9aec2fc90a6..d6fe1c79f18b 100644
--- a/trunk/fs/ubifs/dir.c
+++ b/trunk/fs/ubifs/dir.c
@@ -56,7 +56,7 @@
  *
  * This function returns the inherited flags.
  */
-static int inherit_flags(const struct inode *dir, int mode)
+static int inherit_flags(const struct inode *dir, umode_t mode)
 {
 	int flags;
 	const struct ubifs_inode *ui = ubifs_inode(dir);
@@ -86,7 +86,7 @@ static int inherit_flags(const struct inode *dir, int mode)
  * case of failure.
  */
 struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir,
-			      int mode)
+			      umode_t mode)
 {
 	struct inode *inode;
 	struct ubifs_inode *ui;
diff --git a/trunk/fs/ubifs/ubifs.h b/trunk/fs/ubifs/ubifs.h
index 27f22551f805..12e94774aa88 100644
--- a/trunk/fs/ubifs/ubifs.h
+++ b/trunk/fs/ubifs/ubifs.h
@@ -1734,7 +1734,7 @@ int ubifs_setattr(struct dentry *dentry, struct iattr *attr);
 
 /* dir.c */
 struct inode *ubifs_new_inode(struct ubifs_info *c, const struct inode *dir,
-			      int mode);
+			      umode_t mode);
 int ubifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
 		  struct kstat *stat);