Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/linux-5.17-mpi' into linux-5.17.…
Browse files Browse the repository at this point in the history
…1-mpi

* origin/linux-5.17-mpi:
  config-mpi: Add
  ext4: Reduce "mounted" log from INFO to DEBUG
  mount: Remove warning for impending timestamp expiry
  md: Avoid sync_action sync->idle transition deadlock
  kernel/rcu: Print out more information when NMI stall
  nfsd: Add trace events for all v4 operations
  • Loading branch information
donald committed Apr 12, 2022
2 parents 59db887 + ad3a8b0 commit bf05a1a
Show file tree
Hide file tree
Showing 8 changed files with 1,135 additions and 29 deletions.
848 changes: 848 additions & 0 deletions config-mpi

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -4840,12 +4840,14 @@ action_store(struct mddev *mddev, const char *page, size_t len)
clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) &&
mddev_lock(mddev) == 0) {
set_bit(MD_ALLOW_SB_UPDATE, &mddev->flags);
if (work_pending(&mddev->del_work))
flush_workqueue(md_misc_wq);
if (mddev->sync_thread) {
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
md_reap_sync_thread(mddev);
}
clear_bit(MD_ALLOW_SB_UPDATE, &mddev->flags);
mddev_unlock(mddev);
}
} else if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery))
Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -5566,7 +5566,7 @@ static int ext4_fill_super(struct super_block *sb, struct fs_context *fc)
descr = "out journal";

if (___ratelimit(&ext4_mount_msg_ratelimit, "EXT4-fs mount"))
ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "
ext4_msg(sb, KERN_DEBUG, "mounted filesystem with%s. "
"Quota mode: %s.", descr, ext4_quota_mode(sb));

return 0;
Expand Down
27 changes: 0 additions & 27 deletions fs/namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -2592,27 +2592,6 @@ static void set_mount_attributes(struct mount *mnt, unsigned int mnt_flags)
touch_mnt_namespace(mnt->mnt_ns);
}

static void mnt_warn_timestamp_expiry(struct path *mountpoint, struct vfsmount *mnt)
{
struct super_block *sb = mnt->mnt_sb;

if (!__mnt_is_readonly(mnt) &&
(ktime_get_real_seconds() + TIME_UPTIME_SEC_MAX > sb->s_time_max)) {
char *buf = (char *)__get_free_page(GFP_KERNEL);
char *mntpath = buf ? d_path(mountpoint, buf, PAGE_SIZE) : ERR_PTR(-ENOMEM);
struct tm tm;

time64_to_tm(sb->s_time_max, 0, &tm);

pr_warn("%s filesystem being %s at %s supports timestamps until %04ld (0x%llx)\n",
sb->s_type->name,
is_mounted(mnt) ? "remounted" : "mounted",
mntpath,
tm.tm_year+1900, (unsigned long long)sb->s_time_max);

free_page((unsigned long)buf);
}
}

/*
* Handle reconfiguration of the mountpoint only without alteration of the
Expand Down Expand Up @@ -2646,8 +2625,6 @@ static int do_reconfigure_mnt(struct path *path, unsigned int mnt_flags)
unlock_mount_hash();
up_read(&sb->s_umount);

mnt_warn_timestamp_expiry(path, &mnt->mnt);

return ret;
}

Expand Down Expand Up @@ -2693,8 +2670,6 @@ static int do_remount(struct path *path, int ms_flags, int sb_flags,
up_write(&sb->s_umount);
}

mnt_warn_timestamp_expiry(path, &mnt->mnt);

put_fs_context(fc);
return err;
}
Expand Down Expand Up @@ -2962,8 +2937,6 @@ static int do_new_mount_fc(struct fs_context *fc, struct path *mountpoint,
if (IS_ERR(mnt))
return PTR_ERR(mnt);

mnt_warn_timestamp_expiry(mountpoint, mnt);

mp = lock_mount(mountpoint);
if (IS_ERR(mp)) {
mntput(mnt);
Expand Down
Loading

0 comments on commit bf05a1a

Please sign in to comment.