From 70483c9f6c91faa9ec7f8ae577d34969462b774d Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 12 Feb 2012 21:00:05 -0500 Subject: [PATCH] --- yaml --- r: 287764 b: refs/heads/master c: 847c9db5cb50841589b8ebd3da0769b1b02fb3b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/namei.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1d48a3366d43..bcf16e553eb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcf83067bf6eb101a35620d752bd559d473cfbaa +refs/heads/master: 847c9db5cb50841589b8ebd3da0769b1b02fb3b2 diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c index be244692550d..a9856e3eaaf0 100644 --- a/trunk/fs/ocfs2/namei.c +++ b/trunk/fs/ocfs2/namei.c @@ -1053,7 +1053,7 @@ static int ocfs2_rename(struct inode *old_dir, handle_t *handle = NULL; struct buffer_head *old_dir_bh = NULL; struct buffer_head *new_dir_bh = NULL; - nlink_t old_dir_nlink = old_dir->i_nlink; + u32 old_dir_nlink = old_dir->i_nlink; struct ocfs2_dinode *old_di; struct ocfs2_dir_lookup_result old_inode_dot_dot_res = { NULL, }; struct ocfs2_dir_lookup_result target_lookup_res = { NULL, };