diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-02 23:22:20 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-02-02 23:22:20 -0300 |
commit | 5c545e1fb127a4b11ddc5f1a5ed066b853dd1a1a (patch) | |
tree | d4cd913bc79d37d32756a9bffbeedabf93e32579 /fs | |
parent | b4b7ff4b08e691656c9d77c758fc355833128ac0 (diff) |
Linux-libre 4.4.1-gnupck-4.4.1-gnu
Diffstat (limited to 'fs')
-rw-r--r-- | fs/aufs/inode.c | 7 | ||||
-rw-r--r-- | fs/aufs/inode.h | 6 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 1 | ||||
-rw-r--r-- | fs/inode.c | 4 | ||||
-rw-r--r-- | fs/proc/base.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_trans_ail.c | 1 |
6 files changed, 8 insertions, 13 deletions
diff --git a/fs/aufs/inode.c b/fs/aufs/inode.c index 6db3d6f62..cedc53420 100644 --- a/fs/aufs/inode.c +++ b/fs/aufs/inode.c @@ -273,8 +273,7 @@ out: static int reval_inode(struct inode *inode, struct dentry *dentry) { int err; - unsigned int gen; - struct au_iigen iigen; + unsigned int gen, igflags; aufs_bindex_t bindex, bend; struct inode *h_inode, *h_dinode; struct dentry *h_dentry; @@ -299,9 +298,9 @@ static int reval_inode(struct inode *inode, struct dentry *dentry) continue; err = 0; - gen = au_iigen(inode, &iigen); + gen = au_iigen(inode, &igflags); if (gen == au_digen(dentry) - && !au_ig_ftest(iigen.ig_flags, HALF_REFRESHED)) + && !au_ig_ftest(igflags, HALF_REFRESHED)) break; /* fully refresh inode using dentry */ diff --git a/fs/aufs/inode.h b/fs/aufs/inode.h index 31e31f43a..c3e26940f 100644 --- a/fs/aufs/inode.h +++ b/fs/aufs/inode.h @@ -409,7 +409,7 @@ static inline void au_icntnr_init(struct au_icntnr *c) #endif } -static inline unsigned int au_iigen(struct inode *inode, struct au_iigen *iigen_arg) +static inline unsigned int au_iigen(struct inode *inode, unsigned int *igflags) { unsigned int gen; struct au_iinfo *iinfo; @@ -418,8 +418,8 @@ static inline unsigned int au_iigen(struct inode *inode, struct au_iigen *iigen_ iinfo = au_ii(inode); iigen = &iinfo->ii_generation; spin_lock(&iigen->ig_spin); - if (iigen_arg) - *iigen_arg = *iigen; + if (igflags) + *igflags = iigen->ig_flags; gen = iigen->ig_generation; spin_unlock(&iigen->ig_spin); diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 974be09e7..0ddca6734 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1762,7 +1762,6 @@ static int cleaner_kthread(void *arg) int again; struct btrfs_trans_handle *trans; - set_freezable(); do { again = 0; diff --git a/fs/inode.c b/fs/inode.c index b6678aac9..1be5f9003 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -844,8 +844,6 @@ unsigned int get_next_ino(void) unsigned int *p = &get_cpu_var(last_ino); unsigned int res = *p; -start: - #ifdef CONFIG_SMP if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { static atomic_t shared_last_ino; @@ -858,7 +856,7 @@ start: res++; /* get_next_ino should not provide a 0 inode number */ if (unlikely(!res)) - goto start; + res++; *p = res; put_cpu_var(last_ino); return res; diff --git a/fs/proc/base.c b/fs/proc/base.c index db91213bb..aa41f2a7b 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -504,7 +504,7 @@ static int proc_pid_schedstat(struct seq_file *m, struct pid_namespace *ns, seq_printf(m, "0 0 0\n"); else seq_printf(m, "%llu %llu %lu\n", - (unsigned long long)tsk_seruntime(task), + (unsigned long long)task->se.sum_exec_runtime, (unsigned long long)task->sched_info.run_delay, task->sched_info.pcount); diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index aa67339b9..4f18fd92c 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c @@ -497,7 +497,6 @@ xfsaild( long tout = 0; /* milliseconds */ current->flags |= PF_MEMALLOC; - set_freezable(); while (!kthread_should_stop()) { if (tout && tout <= 20) |