Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3873691e authored by Al Viro's avatar Al Viro
Browse files

Merge remote-tracking branch 'ovl/rename2' into for-linus

parents c2050a45 aadfa801

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
- touchscreen-size-y	  : See touchscreen.txt



Optional properties:

- firmware-name		  : File basename (string) for board specific firmware

- touchscreen-inverted-x  : See touchscreen.txt

- touchscreen-inverted-y  : See touchscreen.txt

- touchscreen-swapped-x-y : See touchscreen.txt

Documentation/devicetree/bindings/mmc/sdhci-st.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
			subsystem (mmcss) inside the FlashSS (available in STiH407 SoC

			family).



- clock-names:		Should be "mmc".

- clock-names:		Should be "mmc" and "icn".  (NB: The latter is not compulsory)

			See: Documentation/devicetree/bindings/resource-names.txt

- clocks:		Phandle to the clock.

			See: Documentation/devicetree/bindings/clock/clock-bindings.txt

Documentation/filesystems/Locking

+2 −6
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ prototypes: 
	int (*rmdir) (struct inode *,struct dentry *);

	int (*mknod) (struct inode *,struct dentry *,umode_t,dev_t);

	int (*rename) (struct inode *, struct dentry *,

			struct inode *, struct dentry *);

	int (*rename2) (struct inode *, struct dentry *,

			struct inode *, struct dentry *, unsigned int);

	int (*readlink) (struct dentry *, char __user *,int);

	const char *(*get_link) (struct dentry *, struct inode *, void **);
@@ -84,7 +82,6 @@ mkdir: yes 
unlink:		yes (both)

rmdir:		yes (both)	(see below)

rename:	yes (all)	(see below)

rename2:	yes (all)	(see below)

readlink:	no

get_link:	no

setattr:	yes
@@ -102,8 +99,7 @@ tmpfile: no 


	Additionally, ->rmdir(), ->unlink() and ->rename() have ->i_mutex on

victim.

	cross-directory ->rename() and rename2() has (per-superblock)

->s_vfs_rename_sem.

	cross-directory ->rename() has (per-superblock) ->s_vfs_rename_sem.



See Documentation/filesystems/directory-locking for more detailed discussion

of the locking scheme for directory operations.

Documentation/filesystems/directory-locking

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ locks victim and calls the method. Locks are exclusive. 


4) rename() that is _not_ cross-directory.  Locking rules: caller locks

the parent and finds source and target.  In case of exchange (with

RENAME_EXCHANGE in rename2() flags argument) lock both.  In any case,

RENAME_EXCHANGE in flags argument) lock both.  In any case,

if the target already exists, lock it.  If the source is a non-directory,

lock it.  If we need to lock both, lock them in inode pointer order.

Then call the method.  All locks are exclusive.

Documentation/filesystems/porting

+4 −0
Original line number Diff line number Diff line
@@ -592,3 +592,7 @@ in your dentry operations instead. 
	work just as well; if it's something more complicated, use dentry->d_parent.

	Just be careful not to assume that fetching it more than once will yield

	the same value - in RCU mode it could change under you.

--

[mandatory]

	->rename() has an added flags argument.  Any flags not handled by the

        filesystem should result in EINVAL being returned.