diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:47:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:47:55 -0400 |
| commit | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (patch) | |
| tree | 796a66c7ad29ae1d2d60133fdcd7167a513fac49 /fs/nfs/super.c | |
| parent | fb4284b2b7cfaf3b89557667587cca90bddccc59 (diff) | |
| parent | 744d18dbfae07482ea461701b0aaec3a75ec9224 (diff) | |
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: Ensure we call nfs_sb_deactive() after releasing the directory inode
nfs_remount oops when rebooting + possible fix
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 1b94e3650f5c..9abcd2b329f7 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -1718,9 +1718,9 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) | |||
| 1718 | * ones were explicitly specified. Fall back to legacy behavior and | 1718 | * ones were explicitly specified. Fall back to legacy behavior and |
| 1719 | * just return success. | 1719 | * just return success. |
| 1720 | */ | 1720 | */ |
| 1721 | if ((nfsvers == 4 && options4->version == 1) || | 1721 | if ((nfsvers == 4 && (!options4 || options4->version == 1)) || |
| 1722 | (nfsvers <= 3 && options->version >= 1 && | 1722 | (nfsvers <= 3 && (!options || (options->version >= 1 && |
| 1723 | options->version <= 6)) | 1723 | options->version <= 6)))) |
| 1724 | return 0; | 1724 | return 0; |
| 1725 | 1725 | ||
| 1726 | data = kzalloc(sizeof(*data), GFP_KERNEL); | 1726 | data = kzalloc(sizeof(*data), GFP_KERNEL); |