diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 14:41:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 14:41:01 -0400 |
| commit | d211858837ff8d8e31942ca7d27e6e08b3b46f5e (patch) | |
| tree | a8ec83a791066e64ad02052498dbe39ebefacab9 /fs/hostfs | |
| parent | f1f8935a5c38a2c61e86a42bc971a2539eef2211 (diff) | |
| parent | f0023bc617ba600956b9226f1806033d7486c8ba (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue:
vfs: add d_prune dentry operation
vfs: protect i_nlink
filesystems: add set_nlink()
filesystems: add missing nlink wrappers
logfs: remove unnecessary nlink setting
ocfs2: remove unnecessary nlink setting
jfs: remove unnecessary nlink setting
hypfs: remove unnecessary nlink setting
vfs: ignore error on forced remount
readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
vfs: fix dentry leak in simple_fill_super()
Diffstat (limited to 'fs/hostfs')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 0d22afdd4611..2f72da5ae686 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
| @@ -541,7 +541,7 @@ static int read_name(struct inode *ino, char *name) | |||
| 541 | 541 | ||
| 542 | ino->i_ino = st.ino; | 542 | ino->i_ino = st.ino; |
| 543 | ino->i_mode = st.mode; | 543 | ino->i_mode = st.mode; |
| 544 | ino->i_nlink = st.nlink; | 544 | set_nlink(ino, st.nlink); |
| 545 | ino->i_uid = st.uid; | 545 | ino->i_uid = st.uid; |
| 546 | ino->i_gid = st.gid; | 546 | ino->i_gid = st.gid; |
| 547 | ino->i_atime = st.atime; | 547 | ino->i_atime = st.atime; |