git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
[pandora-kernel.git]
/
fs
/
fat
/
inode.c
diff --git
a/fs/fat/inode.c
b/fs/fat/inode.c
index
1726d73
..
808cac7
100644
(file)
--- a/
fs/fat/inode.c
+++ b/
fs/fat/inode.c
@@
-379,7
+379,7
@@
static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
return error;
MSDOS_I(inode)->mmu_private = inode->i_size;
return error;
MSDOS_I(inode)->mmu_private = inode->i_size;
-
inode->i_nlink = fat_subdirs(inode
);
+
set_nlink(inode, fat_subdirs(inode)
);
} else { /* not a directory */
inode->i_generation |= 1;
inode->i_mode = fat_make_mode(sbi, de->attr,
} else { /* not a directory */
inode->i_generation |= 1;
inode->i_mode = fat_make_mode(sbi, de->attr,
@@
-1233,7
+1233,7
@@
static int fat_read_root(struct inode *inode)
fat_save_attrs(inode, ATTR_DIR);
inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
fat_save_attrs(inode, ATTR_DIR);
inode->i_mtime.tv_sec = inode->i_atime.tv_sec = inode->i_ctime.tv_sec = 0;
inode->i_mtime.tv_nsec = inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = 0;
-
inode->i_nlink = fat_subdirs(inode)+2
;
+
set_nlink(inode, fat_subdirs(inode)+2)
;
return 0;
}
return 0;
}