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

Commit e371d46a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  merge fchmod() and fchmodat() guts, kill ancient broken kludge
  xfs: fix misspelled S_IS...()
  xfs: get rid of open-coded S_ISREG(), etc.
  vfs: document locking requirements for d_move, __d_move and d_materialise_unique
  omfs: fix (mode & S_IFDIR) abuse
  btrfs: S_ISREG(mode) is not mode & S_IFREG...
  ima: fmode_t misspelled as mode_t...
  pci-label.c: size_t misspelled as mode_t
  jffs2: S_ISLNK(mode & S_IFMT) is pointless
  snd_msnd ->mode is fmode_t, not mode_t
  v9fs_iop_get_acl: get rid of unused variable
  vfs: dont chain pipe/anon/socket on superblock s_inodes list
  Documentation: Exporting: update description of d_splice_alias
  fs: add missing unlock in default_llseek()
parents b0189cd0 e57712eb

Documentation/filesystems/nfs/Exporting

+8 −1
Original line number Diff line number Diff line
@@ -92,7 +92,14 @@ For a filesystem to be exportable it must: 
   1/ provide the filehandle fragment routines described below.

   2/ make sure that d_splice_alias is used rather than d_add

      when ->lookup finds an inode for a given parent and name.

      Typically the ->lookup routine will end with a:



      If inode is NULL, d_splice_alias(inode, dentry) is eqivalent to



		d_add(dentry, inode), NULL



      Similarly, d_splice_alias(ERR_PTR(err), dentry) = ERR_PTR(err)



      Typically the ->lookup routine will simply end with a:



		return d_splice_alias(inode, dentry);

	}

drivers/pci/pci-label.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ enum smbios_attr_enum { 
	SMBIOS_ATTR_INSTANCE_SHOW,

};



static mode_t

static size_t

find_smbios_instance_string(struct pci_dev *pdev, char *buf,

			    enum smbios_attr_enum attribute)

{

fs/anon_inodes.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ EXPORT_SYMBOL_GPL(anon_inode_getfd); 
 */

static struct inode *anon_inode_mkinode(void)

{

	struct inode *inode = new_inode(anon_inode_mnt->mnt_sb);

	struct inode *inode = new_inode_pseudo(anon_inode_mnt->mnt_sb);



	if (!inode)

		return ERR_PTR(-ENOMEM);

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -4467,7 +4467,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, 
	inode->i_generation = BTRFS_I(inode)->generation;

	btrfs_set_inode_space_info(root, inode);



	if (mode & S_IFDIR)

	if (S_ISDIR(mode))

		owner = 0;

	else

		owner = 1;
@@ -4512,7 +4512,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, 


	btrfs_inherit_iflags(inode, dir);



	if ((mode & S_IFREG)) {

	if (S_ISREG(mode)) {

		if (btrfs_test_opt(root, NODATASUM))

			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;

		if (btrfs_test_opt(root, NODATACOW) ||

fs/dcache.c

+7 −4
Original line number Diff line number Diff line
@@ -2138,8 +2138,9 @@ static void dentry_unlock_parents_for_move(struct dentry *dentry, 
 * @target: new dentry

 *

 * Update the dcache to reflect the move of a file name. Negative

 * dcache entries should not be moved in this way.  Caller hold

 * rename_lock.

 * dcache entries should not be moved in this way. Caller must hold

 * rename_lock, the i_mutex of the source and target directories,

 * and the sb->s_vfs_rename_mutex if they differ. See lock_rename().

 */

static void __d_move(struct dentry * dentry, struct dentry * target)

{
@@ -2202,7 +2203,8 @@ static void __d_move(struct dentry * dentry, struct dentry * target) 
 * @target: new dentry

 *

 * Update the dcache to reflect the move of a file name. Negative

 * dcache entries should not be moved in this way.

 * dcache entries should not be moved in this way. See the locking

 * requirements for __d_move.

 */

void d_move(struct dentry *dentry, struct dentry *target)

{
@@ -2320,7 +2322,8 @@ static void __d_materialise_dentry(struct dentry *dentry, struct dentry *anon) 
 * @inode: inode to bind to the dentry, to which aliases may be attached

 *

 * Introduces an dentry into the tree, substituting an extant disconnected

 * root directory alias in its place if there is one

 * root directory alias in its place if there is one. Caller must hold the

 * i_mutex of the parent directory.

 */

struct dentry *d_materialise_unique(struct dentry *dentry, struct inode *inode)

{