1
0
Fork 0
alistair23-linux/drivers/staging
Linus Torvalds 0f0d12728e Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull mount flag updates from Al Viro:
 "Another chunk of fmount preparations from dhowells; only trivial
  conflicts for that part. It separates MS_... bits (very grotty
  mount(2) ABI) from the struct super_block ->s_flags (kernel-internal,
  only a small subset of MS_... stuff).

  This does *not* convert the filesystems to new constants; only the
  infrastructure is done here. The next step in that series is where the
  conflicts would be; that's the conversion of filesystems. It's purely
  mechanical and it's better done after the merge, so if you could run
  something like

	list=$(for i in MS_RDONLY MS_NOSUID MS_NODEV MS_NOEXEC MS_SYNCHRONOUS MS_MANDLOCK MS_DIRSYNC MS_NOATIME MS_NODIRATIME MS_SILENT MS_POSIXACL MS_KERNMOUNT MS_I_VERSION MS_LAZYTIME; do git grep -l $i fs drivers/staging/lustre drivers/mtd ipc mm include/linux; done|sort|uniq|grep -v '^fs/namespace.c$')

	sed -i -e 's/\<MS_RDONLY\>/SB_RDONLY/g' \
	        -e 's/\<MS_NOSUID\>/SB_NOSUID/g' \
	        -e 's/\<MS_NODEV\>/SB_NODEV/g' \
	        -e 's/\<MS_NOEXEC\>/SB_NOEXEC/g' \
	        -e 's/\<MS_SYNCHRONOUS\>/SB_SYNCHRONOUS/g' \
	        -e 's/\<MS_MANDLOCK\>/SB_MANDLOCK/g' \
	        -e 's/\<MS_DIRSYNC\>/SB_DIRSYNC/g' \
	        -e 's/\<MS_NOATIME\>/SB_NOATIME/g' \
	        -e 's/\<MS_NODIRATIME\>/SB_NODIRATIME/g' \
	        -e 's/\<MS_SILENT\>/SB_SILENT/g' \
	        -e 's/\<MS_POSIXACL\>/SB_POSIXACL/g' \
	        -e 's/\<MS_KERNMOUNT\>/SB_KERNMOUNT/g' \
	        -e 's/\<MS_I_VERSION\>/SB_I_VERSION/g' \
	        -e 's/\<MS_LAZYTIME\>/SB_LAZYTIME/g' \
	        $list

  and commit it with something along the lines of 'convert filesystems
  away from use of MS_... constants' as commit message, it would save a
  quite a bit of headache next cycle"

* 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  VFS: Differentiate mount flags (MS_*) from internal superblock flags
  VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)
  vfs: Add sb_rdonly(sb) to query the MS_RDONLY flag on s_flags
2017-09-14 18:54:01 -07:00
..
android Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2017-09-14 18:13:32 -07:00
board
ccree staging: ccree: save ciphertext for CTS IV 2017-08-23 16:22:35 -07:00
clocking-wizard
comedi Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2017-09-14 18:13:32 -07:00
dgnc
emxx_udc
fbtft staging: fbtft: array underflow in fbtft_request_gpios_match() 2017-07-28 17:08:16 -07:00
fsl-dpaa2 staging: fsl-dpaa2/eth: fix off-by-one FD ctrl bitmaks 2017-09-01 15:53:12 +02:00
fsl-mc Merge 4.13-rc7 into staging-next 2017-08-28 15:26:48 +02:00
fwserial
gdm724x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
goldfish staging: goldfish: (Coding Style) Fixed parenthesis alignment. 2017-08-31 18:21:37 +02:00
greybus media updates for v4.14-rc1 2017-09-07 12:53:14 -07:00
gs_fpgaboot staging: gs_fpgaboot: return valid error codes 2017-07-28 17:07:37 -07:00
iio Second set of IIO new device support, features and cleanup for the 4.14 cycle. 2017-08-20 10:42:42 -07:00
irda staging: irda: fix init level for irda core 2017-08-30 10:15:12 -07:00
ks7010 staging: ks7010: Fix coding style and remove checkpatch.pl warnings. 2017-08-31 18:13:25 +02:00
lustre Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2017-09-14 18:54:01 -07:00
media media: staging: atomisp: sh_css_calloc shall return a pointer to the allocated space 2017-09-05 07:29:29 -04:00
most staging: most: hdm_usb: Driver registration with module_driver macro 2017-08-27 19:59:10 +02:00
mt29f_spinand mtd: nand: Rename nand.h into rawnand.h 2017-08-13 10:11:49 +02:00
netlogic net: phy: Make phy_ethtool_ksettings_get return void 2017-06-13 12:59:06 -04:00
nvec staging: nvec: explicitly request exclusive reset control 2017-07-30 08:28:21 -07:00
octeon staging: octeon: fix line over 80 characters 2017-08-18 15:57:17 -07:00
octeon-usb
olpc_dcon staging: olpc_dcon: remove pointless debug printk in dcon_freeze_store() 2017-08-28 10:27:29 +02:00
pi433 Staging: Pi433: style fix - tabs and spaces 2017-08-31 18:28:34 +02:00
rtl8188eu staging:rtl8188eu:core Fix remove unneccessary else block 2017-09-01 19:08:45 +02:00
rtl8192e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-07-05 12:31:59 -07:00
rtl8192u staging: rtl8192u: fix spelling mistake: "Senondary" -> "Secondary" 2017-07-27 21:51:06 -07:00
rtl8712 staging: rtl8712: constify usb_device_id 2017-08-18 15:57:16 -07:00
rtl8723bs staging: rtl8723bs: hal: remove cast to void pointer 2017-08-29 08:24:04 +02:00
rtlwifi staging: r8822be: Simplify deinit_priv() 2017-08-31 18:29:33 +02:00
rts5208 SCSI misc on 20170907 2017-09-07 21:11:05 -07:00
skein staging: skein: move macros into header file 2017-07-28 17:06:43 -07:00
sm750fb staging: sm750fb: avoid conflicting vesafb 2017-07-18 08:53:45 +02:00
speakup staging: speakup: use tty_kopen and tty_kclose 2017-08-28 16:15:42 +02:00
typec staging: typec: fusb302: make structure fusb302_psy_desc static 2017-09-01 19:06:44 +02:00
unisys SCSI misc on 20170907 2017-09-07 21:11:05 -07:00
vboxvideo Staging/IIO driver updates for 4.14-rc1 2017-09-05 10:36:26 -07:00
vc04_services staging: bcm2835-camera: make video_device const 2017-08-28 10:40:39 +02:00
vme
vt6655 Staging: vt6655: Fixing coding style warnings 2017-07-18 09:00:24 +02:00
vt6656 staging: vt6656: Use variable instead of its type in sizeof(...) 2017-07-16 08:41:02 +02:00
wilc1000 staging: wilc1000: fix spelling mistake: "Iinitialization" -> "initialization" 2017-07-30 08:28:21 -07:00
wlan-ng staging: wlan-ng: hfa384x_usb: Fix multiple line dereference 2017-08-20 11:10:23 -07:00
xgifb staging: fb_xgi: vb_table: Remove white space after tabstop 2017-06-23 19:36:49 +02:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-09-06 14:45:08 -07:00
Makefile Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2017-09-06 14:45:08 -07:00