X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fnamei.c;h=e3c4f112ebf754525de7d5634c298e9d4ba4fba8;hb=cae13fe4cc3f24820ffb990c09110626837e85d4;hp=e6cd6113872ccd4db1dadfa5deff08f90a45c8a0;hpb=e00cf3b9eb7839b952e434a75bff6b99e47337ac;p=pandora-kernel.git diff --git a/fs/namei.c b/fs/namei.c index e6cd6113872c..e3c4f112ebf7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -179,7 +179,7 @@ EXPORT_SYMBOL(putname); static int acl_permission_check(struct inode *inode, int mask, unsigned int flags, int (*check_acl)(struct inode *inode, int mask, unsigned int flags)) { - umode_t mode = inode->i_mode; + unsigned int mode = inode->i_mode; mask &= MAY_READ | MAY_WRITE | MAY_EXEC; @@ -697,6 +697,7 @@ static __always_inline void set_root_rcu(struct nameidata *nd) do { seq = read_seqcount_begin(&fs->seq); nd->root = fs->root; + nd->seq = __read_seqcount_begin(&nd->root.dentry->d_seq); } while (read_seqcount_retry(&fs->seq, seq)); } }