Merge branch 'master' into next
Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
131
fs/fat/inode.c
131
fs/fat/inode.c
@@ -16,7 +16,6 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/msdos_fs.h>
|
||||
#include <linux/pagemap.h>
|
||||
#include <linux/mpage.h>
|
||||
#include <linux/buffer_head.h>
|
||||
@@ -27,7 +26,9 @@
|
||||
#include <linux/uio.h>
|
||||
#include <linux/writeback.h>
|
||||
#include <linux/log2.h>
|
||||
#include <linux/hash.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include "fat.h"
|
||||
|
||||
#ifndef CONFIG_FAT_DEFAULT_IOCHARSET
|
||||
/* if user don't select VFAT, this is undefined. */
|
||||
@@ -63,7 +64,7 @@ static inline int __fat_get_block(struct inode *inode, sector_t iblock,
|
||||
sector_t phys;
|
||||
int err, offset;
|
||||
|
||||
err = fat_bmap(inode, iblock, &phys, &mapped_blocks);
|
||||
err = fat_bmap(inode, iblock, &phys, &mapped_blocks, create);
|
||||
if (err)
|
||||
return err;
|
||||
if (phys) {
|
||||
@@ -93,7 +94,7 @@ static inline int __fat_get_block(struct inode *inode, sector_t iblock,
|
||||
*max_blocks = min(mapped_blocks, *max_blocks);
|
||||
MSDOS_I(inode)->mmu_private += *max_blocks << sb->s_blocksize_bits;
|
||||
|
||||
err = fat_bmap(inode, iblock, &phys, &mapped_blocks);
|
||||
err = fat_bmap(inode, iblock, &phys, &mapped_blocks, create);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
@@ -198,7 +199,14 @@ static ssize_t fat_direct_IO(int rw, struct kiocb *iocb,
|
||||
|
||||
static sector_t _fat_bmap(struct address_space *mapping, sector_t block)
|
||||
{
|
||||
return generic_block_bmap(mapping, block, fat_get_block);
|
||||
sector_t blocknr;
|
||||
|
||||
/* fat_get_cluster() assumes the requested blocknr isn't truncated. */
|
||||
mutex_lock(&mapping->host->i_mutex);
|
||||
blocknr = generic_block_bmap(mapping, block, fat_get_block);
|
||||
mutex_unlock(&mapping->host->i_mutex);
|
||||
|
||||
return blocknr;
|
||||
}
|
||||
|
||||
static const struct address_space_operations fat_aops = {
|
||||
@@ -247,25 +255,21 @@ static void fat_hash_init(struct super_block *sb)
|
||||
INIT_HLIST_HEAD(&sbi->inode_hashtable[i]);
|
||||
}
|
||||
|
||||
static inline unsigned long fat_hash(struct super_block *sb, loff_t i_pos)
|
||||
static inline unsigned long fat_hash(loff_t i_pos)
|
||||
{
|
||||
unsigned long tmp = (unsigned long)i_pos | (unsigned long) sb;
|
||||
tmp = tmp + (tmp >> FAT_HASH_BITS) + (tmp >> FAT_HASH_BITS * 2);
|
||||
return tmp & FAT_HASH_MASK;
|
||||
return hash_32(i_pos, FAT_HASH_BITS);
|
||||
}
|
||||
|
||||
void fat_attach(struct inode *inode, loff_t i_pos)
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct msdos_sb_info *sbi = MSDOS_SB(sb);
|
||||
struct msdos_sb_info *sbi = MSDOS_SB(inode->i_sb);
|
||||
struct hlist_head *head = sbi->inode_hashtable + fat_hash(i_pos);
|
||||
|
||||
spin_lock(&sbi->inode_hash_lock);
|
||||
MSDOS_I(inode)->i_pos = i_pos;
|
||||
hlist_add_head(&MSDOS_I(inode)->i_fat_hash,
|
||||
sbi->inode_hashtable + fat_hash(sb, i_pos));
|
||||
hlist_add_head(&MSDOS_I(inode)->i_fat_hash, head);
|
||||
spin_unlock(&sbi->inode_hash_lock);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(fat_attach);
|
||||
|
||||
void fat_detach(struct inode *inode)
|
||||
@@ -276,13 +280,12 @@ void fat_detach(struct inode *inode)
|
||||
hlist_del_init(&MSDOS_I(inode)->i_fat_hash);
|
||||
spin_unlock(&sbi->inode_hash_lock);
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(fat_detach);
|
||||
|
||||
struct inode *fat_iget(struct super_block *sb, loff_t i_pos)
|
||||
{
|
||||
struct msdos_sb_info *sbi = MSDOS_SB(sb);
|
||||
struct hlist_head *head = sbi->inode_hashtable + fat_hash(sb, i_pos);
|
||||
struct hlist_head *head = sbi->inode_hashtable + fat_hash(i_pos);
|
||||
struct hlist_node *_p;
|
||||
struct msdos_inode_info *i;
|
||||
struct inode *inode = NULL;
|
||||
@@ -341,8 +344,7 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
|
||||
|
||||
if ((de->attr & ATTR_DIR) && !IS_FREE(de->name)) {
|
||||
inode->i_generation &= ~1;
|
||||
inode->i_mode = MSDOS_MKMODE(de->attr,
|
||||
S_IRWXUGO & ~sbi->options.fs_dmask) | S_IFDIR;
|
||||
inode->i_mode = fat_make_mode(sbi, de->attr, S_IRWXUGO);
|
||||
inode->i_op = sbi->dir_ops;
|
||||
inode->i_fop = &fat_dir_operations;
|
||||
|
||||
@@ -359,10 +361,9 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
|
||||
inode->i_nlink = fat_subdirs(inode);
|
||||
} else { /* not a directory */
|
||||
inode->i_generation |= 1;
|
||||
inode->i_mode = MSDOS_MKMODE(de->attr,
|
||||
((sbi->options.showexec && !is_exec(de->name + 8))
|
||||
? S_IRUGO|S_IWUGO : S_IRWXUGO)
|
||||
& ~sbi->options.fs_fmask) | S_IFREG;
|
||||
inode->i_mode = fat_make_mode(sbi, de->attr,
|
||||
((sbi->options.showexec && !is_exec(de->name + 8))
|
||||
? S_IRUGO|S_IWUGO : S_IRWXUGO));
|
||||
MSDOS_I(inode)->i_start = le16_to_cpu(de->start);
|
||||
if (sbi->fat_bits == 32)
|
||||
MSDOS_I(inode)->i_start |= (le16_to_cpu(de->starthi) << 16);
|
||||
@@ -378,25 +379,16 @@ static int fat_fill_inode(struct inode *inode, struct msdos_dir_entry *de)
|
||||
if (sbi->options.sys_immutable)
|
||||
inode->i_flags |= S_IMMUTABLE;
|
||||
}
|
||||
MSDOS_I(inode)->i_attrs = de->attr & ATTR_UNUSED;
|
||||
fat_save_attrs(inode, de->attr);
|
||||
|
||||
inode->i_blocks = ((inode->i_size + (sbi->cluster_size - 1))
|
||||
& ~((loff_t)sbi->cluster_size - 1)) >> 9;
|
||||
inode->i_mtime.tv_sec =
|
||||
date_dos2unix(le16_to_cpu(de->time), le16_to_cpu(de->date),
|
||||
sbi->options.tz_utc);
|
||||
inode->i_mtime.tv_nsec = 0;
|
||||
|
||||
fat_time_fat2unix(sbi, &inode->i_mtime, de->time, de->date, 0);
|
||||
if (sbi->options.isvfat) {
|
||||
int secs = de->ctime_cs / 100;
|
||||
int csecs = de->ctime_cs % 100;
|
||||
inode->i_ctime.tv_sec =
|
||||
date_dos2unix(le16_to_cpu(de->ctime),
|
||||
le16_to_cpu(de->cdate),
|
||||
sbi->options.tz_utc) + secs;
|
||||
inode->i_ctime.tv_nsec = csecs * 10000000;
|
||||
inode->i_atime.tv_sec =
|
||||
date_dos2unix(0, le16_to_cpu(de->adate),
|
||||
sbi->options.tz_utc);
|
||||
inode->i_atime.tv_nsec = 0;
|
||||
fat_time_fat2unix(sbi, &inode->i_ctime, de->ctime,
|
||||
de->cdate, de->ctime_cs);
|
||||
fat_time_fat2unix(sbi, &inode->i_atime, 0, de->adate, 0);
|
||||
} else
|
||||
inode->i_ctime = inode->i_atime = inode->i_mtime;
|
||||
|
||||
@@ -443,13 +435,8 @@ static void fat_delete_inode(struct inode *inode)
|
||||
|
||||
static void fat_clear_inode(struct inode *inode)
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
struct msdos_sb_info *sbi = MSDOS_SB(sb);
|
||||
|
||||
spin_lock(&sbi->inode_hash_lock);
|
||||
fat_cache_inval_inode(inode);
|
||||
hlist_del_init(&MSDOS_I(inode)->i_fat_hash);
|
||||
spin_unlock(&sbi->inode_hash_lock);
|
||||
fat_detach(inode);
|
||||
}
|
||||
|
||||
static void fat_write_super(struct super_block *sb)
|
||||
@@ -555,6 +542,20 @@ static int fat_statfs(struct dentry *dentry, struct kstatfs *buf)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline loff_t fat_i_pos_read(struct msdos_sb_info *sbi,
|
||||
struct inode *inode)
|
||||
{
|
||||
loff_t i_pos;
|
||||
#if BITS_PER_LONG == 32
|
||||
spin_lock(&sbi->inode_hash_lock);
|
||||
#endif
|
||||
i_pos = MSDOS_I(inode)->i_pos;
|
||||
#if BITS_PER_LONG == 32
|
||||
spin_unlock(&sbi->inode_hash_lock);
|
||||
#endif
|
||||
return i_pos;
|
||||
}
|
||||
|
||||
static int fat_write_inode(struct inode *inode, int wait)
|
||||
{
|
||||
struct super_block *sb = inode->i_sb;
|
||||
@@ -564,9 +565,12 @@ static int fat_write_inode(struct inode *inode, int wait)
|
||||
loff_t i_pos;
|
||||
int err;
|
||||
|
||||
if (inode->i_ino == MSDOS_ROOT_INO)
|
||||
return 0;
|
||||
|
||||
retry:
|
||||
i_pos = MSDOS_I(inode)->i_pos;
|
||||
if (inode->i_ino == MSDOS_ROOT_INO || !i_pos)
|
||||
i_pos = fat_i_pos_read(sbi, inode);
|
||||
if (!i_pos)
|
||||
return 0;
|
||||
|
||||
bh = sb_bread(sb, i_pos >> sbi->dir_per_block_bits);
|
||||
@@ -588,19 +592,17 @@ retry:
|
||||
raw_entry->size = 0;
|
||||
else
|
||||
raw_entry->size = cpu_to_le32(inode->i_size);
|
||||
raw_entry->attr = fat_attr(inode);
|
||||
raw_entry->attr = fat_make_attrs(inode);
|
||||
raw_entry->start = cpu_to_le16(MSDOS_I(inode)->i_logstart);
|
||||
raw_entry->starthi = cpu_to_le16(MSDOS_I(inode)->i_logstart >> 16);
|
||||
fat_date_unix2dos(inode->i_mtime.tv_sec, &raw_entry->time,
|
||||
&raw_entry->date, sbi->options.tz_utc);
|
||||
fat_time_unix2fat(sbi, &inode->i_mtime, &raw_entry->time,
|
||||
&raw_entry->date, NULL);
|
||||
if (sbi->options.isvfat) {
|
||||
__le16 atime;
|
||||
fat_date_unix2dos(inode->i_ctime.tv_sec, &raw_entry->ctime,
|
||||
&raw_entry->cdate, sbi->options.tz_utc);
|
||||
fat_date_unix2dos(inode->i_atime.tv_sec, &atime,
|
||||
&raw_entry->adate, sbi->options.tz_utc);
|
||||
raw_entry->ctime_cs = (inode->i_ctime.tv_sec & 1) * 100 +
|
||||
inode->i_ctime.tv_nsec / 10000000;
|
||||
fat_time_unix2fat(sbi, &inode->i_ctime, &raw_entry->ctime,
|
||||
&raw_entry->cdate, &raw_entry->ctime_cs);
|
||||
fat_time_unix2fat(sbi, &inode->i_atime, &atime,
|
||||
&raw_entry->adate, NULL);
|
||||
}
|
||||
spin_unlock(&sbi->inode_hash_lock);
|
||||
mark_buffer_dirty(bh);
|
||||
@@ -819,8 +821,10 @@ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt)
|
||||
seq_puts(m, ",uni_xlate");
|
||||
if (!opts->numtail)
|
||||
seq_puts(m, ",nonumtail");
|
||||
if (opts->rodir)
|
||||
seq_puts(m, ",rodir");
|
||||
}
|
||||
if (sbi->options.flush)
|
||||
if (opts->flush)
|
||||
seq_puts(m, ",flush");
|
||||
if (opts->tz_utc)
|
||||
seq_puts(m, ",tz=UTC");
|
||||
@@ -836,7 +840,7 @@ enum {
|
||||
Opt_charset, Opt_shortname_lower, Opt_shortname_win95,
|
||||
Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
|
||||
Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
|
||||
Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_err,
|
||||
Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err,
|
||||
};
|
||||
|
||||
static const match_table_t fat_tokens = {
|
||||
@@ -908,6 +912,7 @@ static const match_table_t vfat_tokens = {
|
||||
{Opt_nonumtail_yes, "nonumtail=yes"},
|
||||
{Opt_nonumtail_yes, "nonumtail=true"},
|
||||
{Opt_nonumtail_yes, "nonumtail"},
|
||||
{Opt_rodir, "rodir"},
|
||||
{Opt_err, NULL}
|
||||
};
|
||||
|
||||
@@ -927,10 +932,13 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
|
||||
opts->allow_utime = -1;
|
||||
opts->codepage = fat_default_codepage;
|
||||
opts->iocharset = fat_default_iocharset;
|
||||
if (is_vfat)
|
||||
if (is_vfat) {
|
||||
opts->shortname = VFAT_SFN_DISPLAY_LOWER|VFAT_SFN_CREATE_WIN95;
|
||||
else
|
||||
opts->rodir = 0;
|
||||
} else {
|
||||
opts->shortname = 0;
|
||||
opts->rodir = 1;
|
||||
}
|
||||
opts->name_check = 'n';
|
||||
opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0;
|
||||
opts->utf8 = opts->unicode_xlate = 0;
|
||||
@@ -1081,6 +1089,9 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
|
||||
case Opt_nonumtail_yes: /* empty or 1 or yes or true */
|
||||
opts->numtail = 0; /* negated option */
|
||||
break;
|
||||
case Opt_rodir:
|
||||
opts->rodir = 1;
|
||||
break;
|
||||
|
||||
/* obsolete mount options */
|
||||
case Opt_obsolate:
|
||||
@@ -1126,7 +1137,7 @@ static int fat_read_root(struct inode *inode)
|
||||
inode->i_gid = sbi->options.fs_gid;
|
||||
inode->i_version++;
|
||||
inode->i_generation = 0;
|
||||
inode->i_mode = (S_IRWXUGO & ~sbi->options.fs_dmask) | S_IFDIR;
|
||||
inode->i_mode = fat_make_mode(sbi, ATTR_DIR, S_IRWXUGO);
|
||||
inode->i_op = sbi->dir_ops;
|
||||
inode->i_fop = &fat_dir_operations;
|
||||
if (sbi->fat_bits == 32) {
|
||||
@@ -1143,7 +1154,7 @@ static int fat_read_root(struct inode *inode)
|
||||
MSDOS_I(inode)->i_logstart = 0;
|
||||
MSDOS_I(inode)->mmu_private = inode->i_size;
|
||||
|
||||
MSDOS_I(inode)->i_attrs = ATTR_NONE;
|
||||
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;
|
||||
|
Reference in New Issue
Block a user