Skip to content

Commit

Permalink
Merge branch 'akpm' (second patchbomb from Andrew Morton)
Browse files Browse the repository at this point in the history
Merge more incoming from Andrew Morton:
 "Two new syscalls:

     memfd_create in "shm: add memfd_create() syscall"
     kexec_file_load in "kexec: implementation of new syscall kexec_file_load"

  And:

   - Most (all?) of the rest of MM

   - Lots of the usual misc bits

   - fs/autofs4

   - drivers/rtc

   - fs/nilfs

   - procfs

   - fork.c, exec.c

   - more in lib/

   - rapidio

   - Janitorial work in filesystems: fs/ufs, fs/reiserfs, fs/adfs,
     fs/cramfs, fs/romfs, fs/qnx6.

   - initrd/initramfs work

   - "file sealing" and the memfd_create() syscall, in tmpfs

   - add pci_zalloc_consistent, use it in lots of places

   - MAINTAINERS maintenance

   - kexec feature work"

* emailed patches from Andrew Morton <[email protected]: (193 commits)
  MAINTAINERS: update nomadik patterns
  MAINTAINERS: update usb/gadget patterns
  MAINTAINERS: update DMA BUFFER SHARING patterns
  kexec: verify the signature of signed PE bzImage
  kexec: support kexec/kdump on EFI systems
  kexec: support for kexec on panic using new system call
  kexec-bzImage64: support for loading bzImage using 64bit entry
  kexec: load and relocate purgatory at kernel load time
  purgatory: core purgatory functionality
  purgatory/sha256: provide implementation of sha256 in purgaotory context
  kexec: implementation of new syscall kexec_file_load
  kexec: new syscall kexec_file_load() declaration
  kexec: make kexec_segment user buffer pointer a union
  resource: provide new functions to walk through resources
  kexec: use common function for kimage_normal_alloc() and kimage_crash_alloc()
  kexec: move segment verification code in a separate function
  kexec: rename unusebale_pages to unusable_pages
  kernel: build bin2c based on config option CONFIG_BUILD_BIN2C
  bin2c: move bin2c in scripts/basic
  shm: wait for pins to be released when sealing
  ...
  • Loading branch information
torvalds committed Aug 8, 2014
2 parents 27d438c + ecc265f commit 8065be8
Show file tree
Hide file tree
Showing 348 changed files with 10,304 additions and 3,651 deletions.
7 changes: 7 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,9 @@ S: 17 rue Danton
S: F - 94270 Le Kremlin-Bicêtre
S: France

N: Jack Hammer
D: IBM ServeRAID RAID (ips) driver maintenance

N: Greg Hankins
E: [email protected]
D: fixed keyboard driver to separate LED and locking status
Expand Down Expand Up @@ -1691,6 +1694,10 @@ S: Reading
S: RG6 2NU
S: United Kingdom

N: Dave Jeffery
E: [email protected]
D: SCSI hacks and IBM ServeRAID RAID driver maintenance

N: Jakub Jelinek
E: [email protected]
W: http://sunsite.mff.cuni.cz/~jj
Expand Down
269 changes: 269 additions & 0 deletions Documentation/ABI/testing/sysfs-fs-nilfs2
Original file line number Diff line number Diff line change
@@ -0,0 +1,269 @@

What: /sys/fs/nilfs2/features/revision
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show current revision of NILFS file system driver.
This value informs about file system revision that
driver is ready to support.

What: /sys/fs/nilfs2/features/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/features group.

What: /sys/fs/nilfs2/<device>/revision
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show NILFS file system revision on volume.
This value informs about metadata structures'
revision on mounted volume.

What: /sys/fs/nilfs2/<device>/blocksize
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show volume's block size in bytes.

What: /sys/fs/nilfs2/<device>/device_size
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show volume size in bytes.

What: /sys/fs/nilfs2/<device>/free_blocks
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show count of free blocks on volume.

What: /sys/fs/nilfs2/<device>/uuid
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show volume's UUID (Universally Unique Identifier).

What: /sys/fs/nilfs2/<device>/volume_name
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show volume's label.

What: /sys/fs/nilfs2/<device>/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/<device> group.

What: /sys/fs/nilfs2/<device>/superblock/sb_write_time
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show last write time of super block in human-readable
format.

What: /sys/fs/nilfs2/<device>/superblock/sb_write_time_secs
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show last write time of super block in seconds.

What: /sys/fs/nilfs2/<device>/superblock/sb_write_count
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show current write count of super block.

What: /sys/fs/nilfs2/<device>/superblock/sb_update_frequency
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show/Set interval of periodical update of superblock
(in seconds).

What: /sys/fs/nilfs2/<device>/superblock/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/<device>/superblock
group.

What: /sys/fs/nilfs2/<device>/segctor/last_pseg_block
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show start block number of the latest segment.

What: /sys/fs/nilfs2/<device>/segctor/last_seg_sequence
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show sequence value of the latest segment.

What: /sys/fs/nilfs2/<device>/segctor/last_seg_checkpoint
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show checkpoint number of the latest segment.

What: /sys/fs/nilfs2/<device>/segctor/current_seg_sequence
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show segment sequence counter.

What: /sys/fs/nilfs2/<device>/segctor/current_last_full_seg
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show index number of the latest full segment.

What: /sys/fs/nilfs2/<device>/segctor/next_full_seg
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show index number of the full segment index
to be used next.

What: /sys/fs/nilfs2/<device>/segctor/next_pseg_offset
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show offset of next partial segment in the current
full segment.

What: /sys/fs/nilfs2/<device>/segctor/next_checkpoint
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show next checkpoint number.

What: /sys/fs/nilfs2/<device>/segctor/last_seg_write_time
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show write time of the last segment in
human-readable format.

What: /sys/fs/nilfs2/<device>/segctor/last_seg_write_time_secs
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show write time of the last segment in seconds.

What: /sys/fs/nilfs2/<device>/segctor/last_nongc_write_time
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show write time of the last segment not for cleaner
operation in human-readable format.

What: /sys/fs/nilfs2/<device>/segctor/last_nongc_write_time_secs
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show write time of the last segment not for cleaner
operation in seconds.

What: /sys/fs/nilfs2/<device>/segctor/dirty_data_blocks_count
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of dirty data blocks.

What: /sys/fs/nilfs2/<device>/segctor/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/<device>/segctor
group.

What: /sys/fs/nilfs2/<device>/segments/segments_number
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of segments on a volume.

What: /sys/fs/nilfs2/<device>/segments/blocks_per_segment
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of blocks in segment.

What: /sys/fs/nilfs2/<device>/segments/clean_segments
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show count of clean segments.

What: /sys/fs/nilfs2/<device>/segments/dirty_segments
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show count of dirty segments.

What: /sys/fs/nilfs2/<device>/segments/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/<device>/segments
group.

What: /sys/fs/nilfs2/<device>/checkpoints/checkpoints_number
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of checkpoints on volume.

What: /sys/fs/nilfs2/<device>/checkpoints/snapshots_number
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of snapshots on volume.

What: /sys/fs/nilfs2/<device>/checkpoints/last_seg_checkpoint
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show checkpoint number of the latest segment.

What: /sys/fs/nilfs2/<device>/checkpoints/next_checkpoint
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show next checkpoint number.

What: /sys/fs/nilfs2/<device>/checkpoints/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/<device>/checkpoints
group.

What: /sys/fs/nilfs2/<device>/mounted_snapshots/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe content of /sys/fs/nilfs2/<device>/mounted_snapshots
group.

What: /sys/fs/nilfs2/<device>/mounted_snapshots/<id>/inodes_count
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of inodes for snapshot.

What: /sys/fs/nilfs2/<device>/mounted_snapshots/<id>/blocks_count
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Show number of blocks for snapshot.

What: /sys/fs/nilfs2/<device>/mounted_snapshots/<id>/README
Date: April 2014
Contact: "Vyacheslav Dubeyko" <[email protected]>
Description:
Describe attributes of /sys/fs/nilfs2/<device>/mounted_snapshots/<id>
group.
Loading

0 comments on commit 8065be8

Please sign in to comment.