diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 10:45:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-24 10:45:59 -0700 |
commit | a8432588fc1e406e800e8bf88bebf4cd390b7f46 (patch) | |
tree | d008f1b2ff13541b62c562cdb061ecdd1acd06dd | |
parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
parent | c2b93e0699723700f886ce17bb65ffd771195a6d (diff) | |
download | op-kernel-dev-a8432588fc1e406e800e8bf88bebf4cd390b7f46.zip op-kernel-dev-a8432588fc1e406e800e8bf88bebf4cd390b7f46.tar.gz |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fix from Steve French:
"One cifs fix to merge now - fixes possible DFS oops (I expect to
request a merge of 4 additional cifs fixes next week)"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
cifs: only set ops for inodes in I_NEW state
-rw-r--r-- | fs/cifs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index fc30251..20efd81 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -171,7 +171,8 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr) if (fattr->cf_flags & CIFS_FATTR_DFS_REFERRAL) inode->i_flags |= S_AUTOMOUNT; - cifs_set_ops(inode); + if (inode->i_state & I_NEW) + cifs_set_ops(inode); } void |